[chore] Update activity dependency (#2031)

182 files changed, 5794 insertions, 27530 deletions

diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_actor/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_actor/gen_pkg.go
index d5a862f2f..6e5d62e32 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_actor/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_actor/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_actor/gen_property_activitystreams_actor.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_actor/gen_property_activitystreams_actor.go
index aa8eee20a..a90953fc1 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_actor/gen_property_activitystreams_actor.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_actor/gen_property_activitystreams_actor.go
@@ -25,10 +25,8 @@ type ActivityStreamsActorPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsActorPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsActorPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsActorPropertyIterator(i interface{}, aliasMap map
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsActorPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsActorPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsActorPropertyIterator(i interface{}, aliasMap map
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsActorPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsActorPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsActorPropertyIterator(i interface{}, aliasMap map
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsActorPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsActorPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsActorPropertyIterator(i interface{}, aliasMap map
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsActorPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsActorPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsActorPropertyIterator(i interface{}, aliasMap map
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsActorPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsActorPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsActorPropertyIterator(i interface{}, aliasMap map
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsActorPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsActorPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsActorPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsActorPropertyIterator) GetActivityStreamsView() vocab.
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsActorPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsActorPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsActorPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsActorPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsActorPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsActorPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsActorPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsActorPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsActorPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsActorPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsActorPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsActorPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsActorPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsActorPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsActorPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsActorPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsActorPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsActorPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsActorPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsActorPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsActorPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsActorPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsActorPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsActorPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsActorPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsActorPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsActorPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsActorPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsActorPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsActorPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsActorPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsActorPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsActorPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsActorPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsActorPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsActorPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsActorPropertyIterator) SetActivityStreamsView(v vocab
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsActorPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsActorPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsActorPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsActorPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsActorPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsActorPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsActorPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsActorPropertyIterator) SetTootEmoji(v vocab.TootEmoji
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsActorPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsActorPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsActorPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsActorPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsActorPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsActorPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsActorPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsActorPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsActorPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsActorPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsActorPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsActorPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsActorPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsActorPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsActorPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3740,73 +3513,6 @@ func (this *ActivityStreamsActorProperty) AppendActivityStreamsView(v vocab.Acti
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "actor". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsActorProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "actor". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsActorProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "actor". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsActorProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsActorPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "actor". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsActorProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsActorPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "actor". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsActorProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "actor". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsActorProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsActorPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "actor"
 func (this *ActivityStreamsActorProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsActorPropertyIterator{
@@ -3840,6 +3546,17 @@ func (this *ActivityStreamsActorProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "actor". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsActorProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsActorPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "actor". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsActorProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4814,108 +4531,6 @@ func (this *ActivityStreamsActorProperty) InsertActivityStreamsView(idx int, v v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "actor". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "actor". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "actor". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "actor". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "actor". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "actor". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "actor".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4967,6 +4582,23 @@ func (this *ActivityStreamsActorProperty) InsertTootEmoji(idx int, v vocab.TootE
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "actor". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsActorProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsActorPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "actor". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5090,210 +4722,190 @@ func (this ActivityStreamsActorProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6094,90 +5706,6 @@ func (this *ActivityStreamsActorProperty) PrependActivityStreamsView(v vocab.Act
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "actor". Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsActorPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "actor". Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsActorPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "actor". Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsActorPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "actor". Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsActorPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "actor". Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsActorPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "actor". Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsActorPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "actor".
 func (this *ActivityStreamsActorProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsActorPropertyIterator{{
@@ -6219,6 +5747,20 @@ func (this *ActivityStreamsActorProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "actor". Invalidates all iterators.
+func (this *ActivityStreamsActorProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsActorPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "actor". Invalidates all iterators.
 func (this *ActivityStreamsActorProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6987,83 +6529,6 @@ func (this *ActivityStreamsActorProperty) SetActivityStreamsView(idx int, v voca
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "actor". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsActorProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "actor". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsActorProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "actor". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "actor". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsActorProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "actor". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsActorProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "actor". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsActorProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsActorPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "actor".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsActorProperty) SetIRI(idx int, v *url.URL) {
@@ -7101,6 +6566,19 @@ func (this *ActivityStreamsActorProperty) SetTootEmoji(idx int, v vocab.TootEmoj
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "actor". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsActorProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsActorPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "actor". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_anyof/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_anyof/gen_pkg.go
index eec69e1e6..b9d35ab01 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_anyof/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_anyof/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_anyof/gen_property_activitystreams_anyOf.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_anyof/gen_property_activitystreams_anyOf.go
index b1541b3c1..2db157c2a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_anyof/gen_property_activitystreams_anyOf.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_anyof/gen_property_activitystreams_anyOf.go
@@ -25,10 +25,8 @@ type ActivityStreamsAnyOfPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsAnyOfPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsAnyOfPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsAnyOfPropertyIterator(i interface{}, aliasMap map
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAnyOfPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAnyOfPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsAnyOfPropertyIterator(i interface{}, aliasMap map
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAnyOfPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAnyOfPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsAnyOfPropertyIterator(i interface{}, aliasMap map
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsAnyOfPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAnyOfPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsAnyOfPropertyIterator(i interface{}, aliasMap map
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAnyOfPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAnyOfPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsAnyOfPropertyIterator(i interface{}, aliasMap map
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAnyOfPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAnyOfPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsAnyOfPropertyIterator(i interface{}, aliasMap map
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAnyOfPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAnyOfPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAnyOfPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsAnyOfPropertyIterator) GetActivityStreamsView() vocab.
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsAnyOfPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsAnyOfPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsAnyOfPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsAnyOfPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsAnyOfPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsAnyOfPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsAnyOfPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsAnyOfPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsAnyOfPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsAnyOfPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsAnyOfPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsAnyOfPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsAnyOfPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsAnyOfPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsAnyOfPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsAnyOfPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsAnyOfPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsAnyOfPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsAnyOfPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsAnyOfPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsAnyOfPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsAnyOfPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsAnyOfPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsAnyOfPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsAnyOfPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsAnyOfPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsAnyOfPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsAnyOfPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsAnyOfPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsAnyOfPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsAnyOfPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsAnyOfPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsAnyOfPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsAnyOfPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsAnyOfPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsAnyOfPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsAnyOfPropertyIterator) SetActivityStreamsView(v vocab
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsAnyOfPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsAnyOfPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsAnyOfPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsAnyOfPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsAnyOfPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsAnyOfPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsAnyOfPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsAnyOfPropertyIterator) SetTootEmoji(v vocab.TootEmoji
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsAnyOfPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsAnyOfPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsAnyOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsAnyOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsAnyOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsAnyOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsAnyOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsAnyOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsAnyOfPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsAnyOfPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsAnyOfPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsAnyOfPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsAnyOfPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsAnyOfPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsAnyOfPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3740,73 +3513,6 @@ func (this *ActivityStreamsAnyOfProperty) AppendActivityStreamsView(v vocab.Acti
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "anyOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAnyOfProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "anyOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAnyOfProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "anyOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAnyOfProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsAnyOfPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "anyOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAnyOfProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsAnyOfPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "anyOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAnyOfProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "anyOf". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsAnyOfProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsAnyOfPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "anyOf"
 func (this *ActivityStreamsAnyOfProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsAnyOfPropertyIterator{
@@ -3840,6 +3546,17 @@ func (this *ActivityStreamsAnyOfProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "anyOf". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsAnyOfProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsAnyOfPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "anyOf". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsAnyOfProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4814,108 +4531,6 @@ func (this *ActivityStreamsAnyOfProperty) InsertActivityStreamsView(idx int, v v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "anyOf". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "anyOf". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "anyOf". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "anyOf". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "anyOf". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "anyOf". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "anyOf".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4967,6 +4582,23 @@ func (this *ActivityStreamsAnyOfProperty) InsertTootEmoji(idx int, v vocab.TootE
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "anyOf". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsAnyOfProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsAnyOfPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "anyOf". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5090,210 +4722,190 @@ func (this ActivityStreamsAnyOfProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6094,90 +5706,6 @@ func (this *ActivityStreamsAnyOfProperty) PrependActivityStreamsView(v vocab.Act
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "anyOf". Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsAnyOfPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "anyOf". Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsAnyOfPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "anyOf". Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsAnyOfPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "anyOf". Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsAnyOfPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "anyOf". Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsAnyOfPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "anyOf". Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsAnyOfPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "anyOf".
 func (this *ActivityStreamsAnyOfProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsAnyOfPropertyIterator{{
@@ -6219,6 +5747,20 @@ func (this *ActivityStreamsAnyOfProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "anyOf". Invalidates all iterators.
+func (this *ActivityStreamsAnyOfProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsAnyOfPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "anyOf". Invalidates all iterators.
 func (this *ActivityStreamsAnyOfProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6987,83 +6529,6 @@ func (this *ActivityStreamsAnyOfProperty) SetActivityStreamsView(idx int, v voca
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "anyOf". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAnyOfProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "anyOf". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAnyOfProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "anyOf". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "anyOf". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAnyOfProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "anyOf". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAnyOfProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "anyOf". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsAnyOfProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAnyOfPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "anyOf".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsAnyOfProperty) SetIRI(idx int, v *url.URL) {
@@ -7101,6 +6566,19 @@ func (this *ActivityStreamsAnyOfProperty) SetTootEmoji(idx int, v vocab.TootEmoj
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "anyOf". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsAnyOfProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsAnyOfPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "anyOf". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attachment/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attachment/gen_pkg.go
index 5fe6b5df6..6d6692266 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attachment/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attachment/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attachment/gen_property_activitystreams_attachment.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attachment/gen_property_activitystreams_attachment.go
index 78943e5f7..ad907f08f 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attachment/gen_property_activitystreams_attachment.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attachment/gen_property_activitystreams_attachment.go
@@ -25,10 +25,8 @@ type ActivityStreamsAttachmentPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsAttachmentPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsAttachmentPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsAttachmentPropertyIterator(i interface{}, aliasMa
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttachmentPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttachmentPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsAttachmentPropertyIterator(i interface{}, aliasMa
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttachmentPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttachmentPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsAttachmentPropertyIterator(i interface{}, aliasMa
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsAttachmentPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttachmentPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsAttachmentPropertyIterator(i interface{}, aliasMa
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttachmentPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttachmentPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsAttachmentPropertyIterator(i interface{}, aliasMa
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttachmentPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttachmentPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsAttachmentPropertyIterator(i interface{}, aliasMa
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttachmentPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttachmentPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttachmentPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsAttachmentPropertyIterator) GetActivityStreamsView() v
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsAttachmentPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsAttachmentPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsAttachmentPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsAttachmentPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsAttachmentPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsAttachmentPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsAttachmentPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsAttachmentPropertyIterator) GetTootEmoji() vocab.TootE
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsAttachmentPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsAttachmentPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsAttachmentPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsAttachmentPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsAttachmentPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsAttachmentPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsAttachmentPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsAttachmentPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsAttachmentPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsAttachmentPropertyIterator) IsActivityStreamsView() bo
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsAttachmentPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsAttachmentPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsAttachmentPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsAttachmentPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsAttachmentPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsAttachmentPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsAttachmentPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsAttachmentPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsAttachmentPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsAttachmentPropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsAttachmentPropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsAttachmentPropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsAttachmentPropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsAttachmentPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsAttachmentPropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsAttachmentPropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsAttachmentPropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsAttachmentPropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsAttachmentPropertyIterator) SetActivityStreamsView(v
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsAttachmentPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsAttachmentPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsAttachmentPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsAttachmentPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsAttachmentPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsAttachmentPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsAttachmentPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsAttachmentPropertyIterator) SetTootEmoji(v vocab.Toot
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsAttachmentPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsAttachmentPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsAttachmentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsAttachmentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsAttachmentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsAttachmentPropertyIterator) SetType(t vocab.Type) err
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsAttachmentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsAttachmentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsAttachmentPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsAttachmentPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsAttachmentPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsAttachmentPropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsAttachmentPropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsAttachmentPropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsAttachmentPropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3749,74 +3522,6 @@ func (this *ActivityStreamsAttachmentProperty) AppendActivityStreamsView(v vocab
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "attachment". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAttachmentProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "attachment". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAttachmentProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "attachment". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAttachmentProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsAttachmentPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "attachment". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsAttachmentProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsAttachmentPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "attachment". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAttachmentProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "attachment". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsAttachmentProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsAttachmentPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property
 // "attachment"
 func (this *ActivityStreamsAttachmentProperty) AppendIRI(v *url.URL) {
@@ -3851,6 +3556,17 @@ func (this *ActivityStreamsAttachmentProperty) AppendTootEmoji(v vocab.TootEmoji
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "attachment". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsAttachmentProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsAttachmentPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "attachment". Invalidates iterators that are traversing using
 // Prev.
@@ -4827,108 +4543,6 @@ func (this *ActivityStreamsAttachmentProperty) InsertActivityStreamsView(idx int
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "attachment". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "attachment". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "attachment". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "attachment". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "attachment". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "attachment". Existing elements at that
-// index and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "attachment".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4980,6 +4594,23 @@ func (this *ActivityStreamsAttachmentProperty) InsertTootEmoji(idx int, v vocab.
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "attachment". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsAttachmentProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsAttachmentPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "attachment". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5103,210 +4734,190 @@ func (this ActivityStreamsAttachmentProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6107,90 +5718,6 @@ func (this *ActivityStreamsAttachmentProperty) PrependActivityStreamsView(v voca
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "attachment". Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsAttachmentPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "attachment". Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsAttachmentPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "attachment". Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsAttachmentPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "attachment". Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsAttachmentPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "attachment". Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsAttachmentPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "attachment". Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsAttachmentPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "attachment".
 func (this *ActivityStreamsAttachmentProperty) PrependIRI(v *url.URL) {
@@ -6233,6 +5760,20 @@ func (this *ActivityStreamsAttachmentProperty) PrependTootEmoji(v vocab.TootEmoj
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "attachment". Invalidates all iterators.
+func (this *ActivityStreamsAttachmentProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsAttachmentPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "attachment". Invalidates all iterators.
 func (this *ActivityStreamsAttachmentProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -7001,84 +6542,6 @@ func (this *ActivityStreamsAttachmentProperty) SetActivityStreamsView(idx int, v
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "attachment". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsAttachmentProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "attachment". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsAttachmentProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "attachment". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAttachmentProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "attachment". Panics if the index is out of bounds.
-// Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "attachment". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsAttachmentProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "attachment". Panics if the index is out
-// of bounds. Invalidates all iterators.
-func (this *ActivityStreamsAttachmentProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttachmentPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "attachment". Panics if the index is out of bounds.
 func (this *ActivityStreamsAttachmentProperty) SetIRI(idx int, v *url.URL) {
@@ -7117,6 +6580,19 @@ func (this *ActivityStreamsAttachmentProperty) SetTootEmoji(idx int, v vocab.Too
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "attachment". Panics if the index is out of bounds. Invalidates
+// all iterators.
+func (this *ActivityStreamsAttachmentProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsAttachmentPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "attachment". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attributedto/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attributedto/gen_pkg.go
index e7ea074e1..0c287aa3c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attributedto/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attributedto/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attributedto/gen_property_activitystreams_attributedTo.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attributedto/gen_property_activitystreams_attributedTo.go
index 6d71eef82..90d6c37b4 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attributedto/gen_property_activitystreams_attributedTo.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_attributedto/gen_property_activitystreams_attributedTo.go
@@ -25,10 +25,8 @@ type ActivityStreamsAttributedToPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsAttributedToPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsAttributedToPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsAttributedToPropertyIterator(i interface{}, alias
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttributedToPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttributedToPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsAttributedToPropertyIterator(i interface{}, alias
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttributedToPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttributedToPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsAttributedToPropertyIterator(i interface{}, alias
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsAttributedToPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttributedToPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsAttributedToPropertyIterator(i interface{}, alias
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttributedToPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttributedToPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsAttributedToPropertyIterator(i interface{}, alias
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttributedToPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttributedToPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsAttributedToPropertyIterator(i interface{}, alias
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttributedToPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAttributedToPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAttributedToPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsAttributedToPropertyIterator) GetActivityStreamsView()
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsAttributedToPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsAttributedToPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsAttributedToPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsAttributedToPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsAttributedToPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsAttributedToPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsAttributedToPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsAttributedToPropertyIterator) GetTootEmoji() vocab.Too
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsAttributedToPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsAttributedToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsAttributedToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsAttributedToPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsAttributedToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsAttributedToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsAttributedToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsAttributedToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsAttributedToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsAttributedToPropertyIterator) IsActivityStreamsView()
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsAttributedToPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsAttributedToPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsAttributedToPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsAttributedToPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsAttributedToPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsAttributedToPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsAttributedToPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsAttributedToPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsAttributedToPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsAttributedToPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsAttributedToPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsAttributedToPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsAttributedToPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsAttributedToPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsAttributedToPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsAttributedToPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsAttributedToPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsAttributedToPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsAttributedToPropertyIterator) SetActivityStreamsView(
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsAttributedToPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsAttributedToPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsAttributedToPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsAttributedToPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsAttributedToPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsAttributedToPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsAttributedToPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsAttributedToPropertyIterator) SetTootEmoji(v vocab.To
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsAttributedToPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsAttributedToPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsAttributedToPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsAttributedToPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsAttributedToPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsAttributedToPropertyIterator) SetType(t vocab.Type) e
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsAttributedToPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsAttributedToPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsAttributedToPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsAttributedToPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsAttributedToPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsAttributedToPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsAttributedToPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsAttributedToPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsAttributedToPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3785,77 +3558,6 @@ func (this *ActivityStreamsAttributedToProperty) AppendActivityStreamsView(v voc
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "attributedTo". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsAttributedToProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "attributedTo". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsAttributedToProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "attributedTo". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAttributedToProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsAttributedToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "attributedTo". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsAttributedToProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsAttributedToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "attributedTo". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsAttributedToProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "attributedTo". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsAttributedToProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsAttributedToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property
 // "attributedTo"
 func (this *ActivityStreamsAttributedToProperty) AppendIRI(v *url.URL) {
@@ -3890,6 +3592,17 @@ func (this *ActivityStreamsAttributedToProperty) AppendTootEmoji(v vocab.TootEmo
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "attributedTo". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsAttributedToProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsAttributedToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "attributedTo". Invalidates iterators that are traversing
 // using Prev.
@@ -4867,108 +4580,6 @@ func (this *ActivityStreamsAttributedToProperty) InsertActivityStreamsView(idx i
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "attributedTo". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "attributedTo". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "attributedTo". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "attributedTo". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "attributedTo". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "attributedTo". Existing elements at that
-// index and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property
 // "attributedTo". Existing elements at that index and higher are shifted back
 // once. Invalidates all iterators.
@@ -5020,6 +4631,23 @@ func (this *ActivityStreamsAttributedToProperty) InsertTootEmoji(idx int, v voca
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "attributedTo". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsAttributedToProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsAttributedToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "attributedTo". Existing elements at that index and higher
 // are shifted back once. Invalidates all iterators.
@@ -5143,210 +4771,190 @@ func (this ActivityStreamsAttributedToProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6148,90 +5756,6 @@ func (this *ActivityStreamsAttributedToProperty) PrependActivityStreamsView(v vo
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "attributedTo". Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsAttributedToPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "attributedTo". Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsAttributedToPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "attributedTo". Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsAttributedToPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "attributedTo". Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsAttributedToPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "attributedTo". Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsAttributedToPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "attributedTo". Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsAttributedToPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "attributedTo".
 func (this *ActivityStreamsAttributedToProperty) PrependIRI(v *url.URL) {
@@ -6274,6 +5798,20 @@ func (this *ActivityStreamsAttributedToProperty) PrependTootEmoji(v vocab.TootEm
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "attributedTo". Invalidates all iterators.
+func (this *ActivityStreamsAttributedToProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsAttributedToPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "attributedTo". Invalidates all iterators.
 func (this *ActivityStreamsAttributedToProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -7042,84 +6580,6 @@ func (this *ActivityStreamsAttributedToProperty) SetActivityStreamsView(idx int,
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "attributedTo". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsAttributedToProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "attributedTo". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsAttributedToProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "attributedTo". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAttributedToProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "attributedTo". Panics if the index is out of bounds.
-// Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "attributedTo". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsAttributedToProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "attributedTo". Panics if the index is out
-// of bounds. Invalidates all iterators.
-func (this *ActivityStreamsAttributedToProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAttributedToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "attributedTo". Panics if the index is out of bounds.
 func (this *ActivityStreamsAttributedToProperty) SetIRI(idx int, v *url.URL) {
@@ -7158,6 +6618,19 @@ func (this *ActivityStreamsAttributedToProperty) SetTootEmoji(idx int, v vocab.T
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "attributedTo". Panics if the index is out of bounds. Invalidates
+// all iterators.
+func (this *ActivityStreamsAttributedToProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsAttributedToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "attributedTo". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_audience/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_audience/gen_pkg.go
index 0b8cdff2b..ea21de001 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_audience/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_audience/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_audience/gen_property_activitystreams_audience.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_audience/gen_property_activitystreams_audience.go
index a850ea836..5513ef5bc 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_audience/gen_property_activitystreams_audience.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_audience/gen_property_activitystreams_audience.go
@@ -25,10 +25,8 @@ type ActivityStreamsAudiencePropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsAudiencePropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsAudiencePropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsAudiencePropertyIterator(i interface{}, aliasMap
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAudiencePropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAudiencePropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsAudiencePropertyIterator(i interface{}, aliasMap
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAudiencePropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAudiencePropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsAudiencePropertyIterator(i interface{}, aliasMap
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsAudiencePropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAudiencePropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsAudiencePropertyIterator(i interface{}, aliasMap
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAudiencePropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAudiencePropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsAudiencePropertyIterator(i interface{}, aliasMap
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAudiencePropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAudiencePropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsAudiencePropertyIterator(i interface{}, aliasMap
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAudiencePropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsAudiencePropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsAudiencePropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsAudiencePropertyIterator) GetActivityStreamsView() voc
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsAudiencePropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsAudiencePropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsAudiencePropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsAudiencePropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsAudiencePropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsAudiencePropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsAudiencePropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsAudiencePropertyIterator) GetTootEmoji() vocab.TootEmo
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsAudiencePropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsAudiencePropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsAudiencePropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsAudiencePropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsAudiencePropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsAudiencePropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsAudiencePropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsAudiencePropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsAudiencePropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsAudiencePropertyIterator) IsActivityStreamsView() bool
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsAudiencePropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsAudiencePropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsAudiencePropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsAudiencePropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsAudiencePropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsAudiencePropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsAudiencePropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsAudiencePropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsAudiencePropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsAudiencePropertyIterator) JSONLDContext() map[string]s
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsAudiencePropertyIterator) JSONLDContext() map[string]s
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsAudiencePropertyIterator) JSONLDContext() map[string]s
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsAudiencePropertyIterator) JSONLDContext() map[string]s
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsAudiencePropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsAudiencePropertyIterator) LessThan(o vocab.ActivityStr
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsAudiencePropertyIterator) LessThan(o vocab.ActivityStr
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsAudiencePropertyIterator) LessThan(o vocab.ActivityStr
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsAudiencePropertyIterator) LessThan(o vocab.ActivityStr
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsAudiencePropertyIterator) SetActivityStreamsView(v vo
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsAudiencePropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsAudiencePropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsAudiencePropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsAudiencePropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsAudiencePropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsAudiencePropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsAudiencePropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsAudiencePropertyIterator) SetTootEmoji(v vocab.TootEm
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsAudiencePropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsAudiencePropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsAudiencePropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsAudiencePropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsAudiencePropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsAudiencePropertyIterator) SetType(t vocab.Type) error
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsAudiencePropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsAudiencePropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsAudiencePropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsAudiencePropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsAudiencePropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsAudiencePropertyIterator) serialize() (interface{}, er
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsAudiencePropertyIterator) serialize() (interface{}, er
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsAudiencePropertyIterator) serialize() (interface{}, er
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsAudiencePropertyIterator) serialize() (interface{}, er
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3749,74 +3522,6 @@ func (this *ActivityStreamsAudienceProperty) AppendActivityStreamsView(v vocab.A
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "audience". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAudienceProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "audience". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAudienceProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "audience". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAudienceProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsAudiencePropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "audience". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsAudienceProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsAudiencePropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "audience". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsAudienceProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "audience". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsAudienceProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsAudiencePropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "audience"
 func (this *ActivityStreamsAudienceProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsAudiencePropertyIterator{
@@ -3850,6 +3555,17 @@ func (this *ActivityStreamsAudienceProperty) AppendTootEmoji(v vocab.TootEmoji)
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "audience". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsAudienceProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsAudiencePropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "audience". Invalidates iterators that are traversing using
 // Prev.
@@ -4825,108 +4541,6 @@ func (this *ActivityStreamsAudienceProperty) InsertActivityStreamsView(idx int,
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "audience". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "audience". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "audience". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "audience". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "audience". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "audience". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "audience".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4978,6 +4592,23 @@ func (this *ActivityStreamsAudienceProperty) InsertTootEmoji(idx int, v vocab.To
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "audience". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsAudienceProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsAudiencePropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "audience". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5101,210 +4732,190 @@ func (this ActivityStreamsAudienceProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6105,90 +5716,6 @@ func (this *ActivityStreamsAudienceProperty) PrependActivityStreamsView(v vocab.
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "audience". Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsAudiencePropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "audience". Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsAudiencePropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "audience". Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsAudiencePropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "audience". Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsAudiencePropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "audience". Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsAudiencePropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "audience". Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsAudiencePropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "audience".
 func (this *ActivityStreamsAudienceProperty) PrependIRI(v *url.URL) {
@@ -6231,6 +5758,20 @@ func (this *ActivityStreamsAudienceProperty) PrependTootEmoji(v vocab.TootEmoji)
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "audience". Invalidates all iterators.
+func (this *ActivityStreamsAudienceProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsAudiencePropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "audience". Invalidates all iterators.
 func (this *ActivityStreamsAudienceProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6999,83 +6540,6 @@ func (this *ActivityStreamsAudienceProperty) SetActivityStreamsView(idx int, v v
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "audience". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAudienceProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "audience". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAudienceProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "audience". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "audience". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsAudienceProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "audience". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsAudienceProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "audience". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsAudienceProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsAudiencePropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "audience". Panics if the index is out of bounds.
 func (this *ActivityStreamsAudienceProperty) SetIRI(idx int, v *url.URL) {
@@ -7113,6 +6577,19 @@ func (this *ActivityStreamsAudienceProperty) SetTootEmoji(idx int, v vocab.TootE
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "audience". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsAudienceProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsAudiencePropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "audience". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bcc/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bcc/gen_pkg.go
index a2b73e358..53edf0919 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bcc/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bcc/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bcc/gen_property_activitystreams_bcc.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bcc/gen_property_activitystreams_bcc.go
index a7e12e32a..483cf8888 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bcc/gen_property_activitystreams_bcc.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bcc/gen_property_activitystreams_bcc.go
@@ -25,10 +25,8 @@ type ActivityStreamsBccPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsBccPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsBccPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -175,12 +170,6 @@ func deserializeActivityStreamsBccPropertyIterator(i interface{}, aliasMap map[s
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBccPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBccPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -193,12 +182,6 @@ func deserializeActivityStreamsBccPropertyIterator(i interface{}, aliasMap map[s
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBccPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBccPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -253,6 +236,12 @@ func deserializeActivityStreamsBccPropertyIterator(i interface{}, aliasMap map[s
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsBccPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBccPropertyIterator{
 				alias:                   alias,
@@ -379,12 +368,6 @@ func deserializeActivityStreamsBccPropertyIterator(i interface{}, aliasMap map[s
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBccPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBccPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -415,12 +398,6 @@ func deserializeActivityStreamsBccPropertyIterator(i interface{}, aliasMap map[s
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBccPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBccPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -439,18 +416,6 @@ func deserializeActivityStreamsBccPropertyIterator(i interface{}, aliasMap map[s
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBccPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBccPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBccPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -874,44 +839,6 @@ func (this ActivityStreamsBccPropertyIterator) GetActivityStreamsView() vocab.Ac
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsBccPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsBccPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsBccPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsBccPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsBccPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsBccPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsBccPropertyIterator) GetIRI() *url.URL {
@@ -931,6 +858,12 @@ func (this ActivityStreamsBccPropertyIterator) GetTootEmoji() vocab.TootEmoji {
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsBccPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -974,18 +907,12 @@ func (this ActivityStreamsBccPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1013,6 +940,9 @@ func (this ActivityStreamsBccPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1076,9 +1006,6 @@ func (this ActivityStreamsBccPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1094,9 +1021,6 @@ func (this ActivityStreamsBccPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1106,12 +1030,6 @@ func (this ActivityStreamsBccPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1147,10 +1065,8 @@ func (this ActivityStreamsBccPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1160,6 +1076,7 @@ func (this ActivityStreamsBccPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1181,18 +1098,14 @@ func (this ActivityStreamsBccPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1585,48 +1498,6 @@ func (this ActivityStreamsBccPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsBccPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsBccPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsBccPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsBccPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsBccPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsBccPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsBccPropertyIterator) IsIRI() bool {
@@ -1646,6 +1517,13 @@ func (this ActivityStreamsBccPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsBccPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1681,14 +1559,10 @@ func (this ActivityStreamsBccPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1707,6 +1581,8 @@ func (this ActivityStreamsBccPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1749,8 +1625,6 @@ func (this ActivityStreamsBccPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1761,18 +1635,12 @@ func (this ActivityStreamsBccPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1834,161 +1702,146 @@ func (this ActivityStreamsBccPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2029,14 +1882,10 @@ func (this ActivityStreamsBccPropertyIterator) LessThan(o vocab.ActivityStreamsB
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2055,6 +1904,8 @@ func (this ActivityStreamsBccPropertyIterator) LessThan(o vocab.ActivityStreamsB
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2097,8 +1948,6 @@ func (this ActivityStreamsBccPropertyIterator) LessThan(o vocab.ActivityStreamsB
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2109,18 +1958,12 @@ func (this ActivityStreamsBccPropertyIterator) LessThan(o vocab.ActivityStreamsB
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2544,48 +2387,6 @@ func (this *ActivityStreamsBccPropertyIterator) SetActivityStreamsView(v vocab.A
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsBccPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsBccPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsBccPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsBccPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsBccPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsBccPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsBccPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2606,6 +2407,13 @@ func (this *ActivityStreamsBccPropertyIterator) SetTootEmoji(v vocab.TootEmoji)
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsBccPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsBccPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2660,10 +2468,6 @@ func (this *ActivityStreamsBccPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2672,10 +2476,6 @@ func (this *ActivityStreamsBccPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2712,6 +2512,10 @@ func (this *ActivityStreamsBccPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2796,10 +2600,6 @@ func (this *ActivityStreamsBccPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2820,10 +2620,6 @@ func (this *ActivityStreamsBccPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2836,14 +2632,6 @@ func (this *ActivityStreamsBccPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2886,10 +2674,8 @@ func (this *ActivityStreamsBccPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2899,6 +2685,7 @@ func (this *ActivityStreamsBccPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2920,18 +2707,14 @@ func (this *ActivityStreamsBccPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2969,14 +2752,10 @@ func (this ActivityStreamsBccPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2995,6 +2774,8 @@ func (this ActivityStreamsBccPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3037,8 +2818,6 @@ func (this ActivityStreamsBccPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3049,18 +2828,12 @@ func (this ActivityStreamsBccPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3738,73 +3511,6 @@ func (this *ActivityStreamsBccProperty) AppendActivityStreamsView(v vocab.Activi
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "bcc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBccProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "bcc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBccProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "bcc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBccProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsBccPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "bcc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBccProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsBccPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "bcc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBccProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "bcc". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsBccProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsBccPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "bcc"
 func (this *ActivityStreamsBccProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsBccPropertyIterator{
@@ -3837,6 +3543,17 @@ func (this *ActivityStreamsBccProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "bcc". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsBccProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsBccPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "bcc". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsBccProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4811,108 +4528,6 @@ func (this *ActivityStreamsBccProperty) InsertActivityStreamsView(idx int, v voc
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "bcc". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "bcc". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "bcc". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "bcc". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "bcc". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "bcc". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "bcc".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4964,6 +4579,23 @@ func (this *ActivityStreamsBccProperty) InsertTootEmoji(idx int, v vocab.TootEmo
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "bcc". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsBccProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsBccPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "bcc". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5087,210 +4719,190 @@ func (this ActivityStreamsBccProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6091,90 +5703,6 @@ func (this *ActivityStreamsBccProperty) PrependActivityStreamsView(v vocab.Activ
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "bcc". Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsBccPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "bcc". Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsBccPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "bcc". Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsBccPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "bcc". Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsBccPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "bcc". Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsBccPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "bcc". Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsBccPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "bcc".
 func (this *ActivityStreamsBccProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsBccPropertyIterator{{
@@ -6216,6 +5744,20 @@ func (this *ActivityStreamsBccProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "bcc". Invalidates all iterators.
+func (this *ActivityStreamsBccProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsBccPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "bcc". Invalidates all iterators.
 func (this *ActivityStreamsBccProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6984,83 +6526,6 @@ func (this *ActivityStreamsBccProperty) SetActivityStreamsView(idx int, v vocab.
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "bcc". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsBccProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "bcc". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsBccProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "bcc". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "bcc". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsBccProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "bcc". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsBccProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "bcc". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsBccProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBccPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "bcc".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsBccProperty) SetIRI(idx int, v *url.URL) {
@@ -7098,6 +6563,19 @@ func (this *ActivityStreamsBccProperty) SetTootEmoji(idx int, v vocab.TootEmoji)
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "bcc". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsBccProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsBccPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "bcc". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bto/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bto/gen_pkg.go
index e3dfa4b1c..10335c308 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bto/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bto/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bto/gen_property_activitystreams_bto.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bto/gen_property_activitystreams_bto.go
index a8b321429..fe6655df0 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bto/gen_property_activitystreams_bto.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_bto/gen_property_activitystreams_bto.go
@@ -25,10 +25,8 @@ type ActivityStreamsBtoPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsBtoPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsBtoPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -175,12 +170,6 @@ func deserializeActivityStreamsBtoPropertyIterator(i interface{}, aliasMap map[s
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBtoPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBtoPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -193,12 +182,6 @@ func deserializeActivityStreamsBtoPropertyIterator(i interface{}, aliasMap map[s
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBtoPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBtoPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -253,6 +236,12 @@ func deserializeActivityStreamsBtoPropertyIterator(i interface{}, aliasMap map[s
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsBtoPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBtoPropertyIterator{
 				alias:                   alias,
@@ -379,12 +368,6 @@ func deserializeActivityStreamsBtoPropertyIterator(i interface{}, aliasMap map[s
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBtoPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBtoPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -415,12 +398,6 @@ func deserializeActivityStreamsBtoPropertyIterator(i interface{}, aliasMap map[s
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBtoPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBtoPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -439,18 +416,6 @@ func deserializeActivityStreamsBtoPropertyIterator(i interface{}, aliasMap map[s
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBtoPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsBtoPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsBtoPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -874,44 +839,6 @@ func (this ActivityStreamsBtoPropertyIterator) GetActivityStreamsView() vocab.Ac
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsBtoPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsBtoPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsBtoPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsBtoPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsBtoPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsBtoPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsBtoPropertyIterator) GetIRI() *url.URL {
@@ -931,6 +858,12 @@ func (this ActivityStreamsBtoPropertyIterator) GetTootEmoji() vocab.TootEmoji {
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsBtoPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -974,18 +907,12 @@ func (this ActivityStreamsBtoPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1013,6 +940,9 @@ func (this ActivityStreamsBtoPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1076,9 +1006,6 @@ func (this ActivityStreamsBtoPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1094,9 +1021,6 @@ func (this ActivityStreamsBtoPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1106,12 +1030,6 @@ func (this ActivityStreamsBtoPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1147,10 +1065,8 @@ func (this ActivityStreamsBtoPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1160,6 +1076,7 @@ func (this ActivityStreamsBtoPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1181,18 +1098,14 @@ func (this ActivityStreamsBtoPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1585,48 +1498,6 @@ func (this ActivityStreamsBtoPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsBtoPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsBtoPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsBtoPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsBtoPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsBtoPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsBtoPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsBtoPropertyIterator) IsIRI() bool {
@@ -1646,6 +1517,13 @@ func (this ActivityStreamsBtoPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsBtoPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1681,14 +1559,10 @@ func (this ActivityStreamsBtoPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1707,6 +1581,8 @@ func (this ActivityStreamsBtoPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1749,8 +1625,6 @@ func (this ActivityStreamsBtoPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1761,18 +1635,12 @@ func (this ActivityStreamsBtoPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1834,161 +1702,146 @@ func (this ActivityStreamsBtoPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2029,14 +1882,10 @@ func (this ActivityStreamsBtoPropertyIterator) LessThan(o vocab.ActivityStreamsB
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2055,6 +1904,8 @@ func (this ActivityStreamsBtoPropertyIterator) LessThan(o vocab.ActivityStreamsB
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2097,8 +1948,6 @@ func (this ActivityStreamsBtoPropertyIterator) LessThan(o vocab.ActivityStreamsB
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2109,18 +1958,12 @@ func (this ActivityStreamsBtoPropertyIterator) LessThan(o vocab.ActivityStreamsB
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2544,48 +2387,6 @@ func (this *ActivityStreamsBtoPropertyIterator) SetActivityStreamsView(v vocab.A
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsBtoPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsBtoPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsBtoPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsBtoPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsBtoPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsBtoPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsBtoPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2606,6 +2407,13 @@ func (this *ActivityStreamsBtoPropertyIterator) SetTootEmoji(v vocab.TootEmoji)
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsBtoPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsBtoPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2660,10 +2468,6 @@ func (this *ActivityStreamsBtoPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2672,10 +2476,6 @@ func (this *ActivityStreamsBtoPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2712,6 +2512,10 @@ func (this *ActivityStreamsBtoPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2796,10 +2600,6 @@ func (this *ActivityStreamsBtoPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2820,10 +2620,6 @@ func (this *ActivityStreamsBtoPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2836,14 +2632,6 @@ func (this *ActivityStreamsBtoPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2886,10 +2674,8 @@ func (this *ActivityStreamsBtoPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2899,6 +2685,7 @@ func (this *ActivityStreamsBtoPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2920,18 +2707,14 @@ func (this *ActivityStreamsBtoPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2969,14 +2752,10 @@ func (this ActivityStreamsBtoPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2995,6 +2774,8 @@ func (this ActivityStreamsBtoPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3037,8 +2818,6 @@ func (this ActivityStreamsBtoPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3049,18 +2828,12 @@ func (this ActivityStreamsBtoPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3738,73 +3511,6 @@ func (this *ActivityStreamsBtoProperty) AppendActivityStreamsView(v vocab.Activi
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "bto". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBtoProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "bto". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBtoProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "bto". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBtoProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsBtoPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "bto". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBtoProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsBtoPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "bto". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsBtoProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "bto". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsBtoProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsBtoPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "bto"
 func (this *ActivityStreamsBtoProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsBtoPropertyIterator{
@@ -3837,6 +3543,17 @@ func (this *ActivityStreamsBtoProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "bto". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsBtoProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsBtoPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "bto". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsBtoProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4811,108 +4528,6 @@ func (this *ActivityStreamsBtoProperty) InsertActivityStreamsView(idx int, v voc
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "bto". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "bto". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "bto". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "bto". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "bto". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "bto". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "bto".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4964,6 +4579,23 @@ func (this *ActivityStreamsBtoProperty) InsertTootEmoji(idx int, v vocab.TootEmo
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "bto". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsBtoProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsBtoPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "bto". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5087,210 +4719,190 @@ func (this ActivityStreamsBtoProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6091,90 +5703,6 @@ func (this *ActivityStreamsBtoProperty) PrependActivityStreamsView(v vocab.Activ
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "bto". Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsBtoPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "bto". Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsBtoPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "bto". Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsBtoPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "bto". Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsBtoPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "bto". Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsBtoPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "bto". Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsBtoPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "bto".
 func (this *ActivityStreamsBtoProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsBtoPropertyIterator{{
@@ -6216,6 +5744,20 @@ func (this *ActivityStreamsBtoProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "bto". Invalidates all iterators.
+func (this *ActivityStreamsBtoProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsBtoPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "bto". Invalidates all iterators.
 func (this *ActivityStreamsBtoProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6984,83 +6526,6 @@ func (this *ActivityStreamsBtoProperty) SetActivityStreamsView(idx int, v vocab.
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "bto". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsBtoProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "bto". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsBtoProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "bto". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "bto". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsBtoProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "bto". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsBtoProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "bto". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsBtoProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsBtoPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "bto".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsBtoProperty) SetIRI(idx int, v *url.URL) {
@@ -7098,6 +6563,19 @@ func (this *ActivityStreamsBtoProperty) SetTootEmoji(idx int, v vocab.TootEmoji)
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "bto". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsBtoProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsBtoPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "bto". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_cc/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_cc/gen_pkg.go
index 9df4925e2..d53422a00 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_cc/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_cc/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_cc/gen_property_activitystreams_cc.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_cc/gen_property_activitystreams_cc.go
index 2560ec0a3..0b1801139 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_cc/gen_property_activitystreams_cc.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_cc/gen_property_activitystreams_cc.go
@@ -25,10 +25,8 @@ type ActivityStreamsCcPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsCcPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsCcPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -175,12 +170,6 @@ func deserializeActivityStreamsCcPropertyIterator(i interface{}, aliasMap map[st
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsCcPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsCcPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -193,12 +182,6 @@ func deserializeActivityStreamsCcPropertyIterator(i interface{}, aliasMap map[st
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsCcPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsCcPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -253,6 +236,12 @@ func deserializeActivityStreamsCcPropertyIterator(i interface{}, aliasMap map[st
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsCcPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsCcPropertyIterator{
 				alias:                   alias,
@@ -379,12 +368,6 @@ func deserializeActivityStreamsCcPropertyIterator(i interface{}, aliasMap map[st
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsCcPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsCcPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -415,12 +398,6 @@ func deserializeActivityStreamsCcPropertyIterator(i interface{}, aliasMap map[st
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsCcPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsCcPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -439,18 +416,6 @@ func deserializeActivityStreamsCcPropertyIterator(i interface{}, aliasMap map[st
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsCcPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsCcPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsCcPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -874,44 +839,6 @@ func (this ActivityStreamsCcPropertyIterator) GetActivityStreamsView() vocab.Act
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsCcPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsCcPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsCcPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsCcPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsCcPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsCcPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsCcPropertyIterator) GetIRI() *url.URL {
@@ -931,6 +858,12 @@ func (this ActivityStreamsCcPropertyIterator) GetTootEmoji() vocab.TootEmoji {
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsCcPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -974,18 +907,12 @@ func (this ActivityStreamsCcPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1013,6 +940,9 @@ func (this ActivityStreamsCcPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1076,9 +1006,6 @@ func (this ActivityStreamsCcPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1094,9 +1021,6 @@ func (this ActivityStreamsCcPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1106,12 +1030,6 @@ func (this ActivityStreamsCcPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1147,10 +1065,8 @@ func (this ActivityStreamsCcPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1160,6 +1076,7 @@ func (this ActivityStreamsCcPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1181,18 +1098,14 @@ func (this ActivityStreamsCcPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1585,48 +1498,6 @@ func (this ActivityStreamsCcPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsCcPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsCcPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsCcPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsCcPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsCcPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsCcPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsCcPropertyIterator) IsIRI() bool {
@@ -1646,6 +1517,13 @@ func (this ActivityStreamsCcPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsCcPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1681,14 +1559,10 @@ func (this ActivityStreamsCcPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1707,6 +1581,8 @@ func (this ActivityStreamsCcPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1749,8 +1625,6 @@ func (this ActivityStreamsCcPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1761,18 +1635,12 @@ func (this ActivityStreamsCcPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1834,161 +1702,146 @@ func (this ActivityStreamsCcPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2029,14 +1882,10 @@ func (this ActivityStreamsCcPropertyIterator) LessThan(o vocab.ActivityStreamsCc
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2055,6 +1904,8 @@ func (this ActivityStreamsCcPropertyIterator) LessThan(o vocab.ActivityStreamsCc
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2097,8 +1948,6 @@ func (this ActivityStreamsCcPropertyIterator) LessThan(o vocab.ActivityStreamsCc
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2109,18 +1958,12 @@ func (this ActivityStreamsCcPropertyIterator) LessThan(o vocab.ActivityStreamsCc
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2544,48 +2387,6 @@ func (this *ActivityStreamsCcPropertyIterator) SetActivityStreamsView(v vocab.Ac
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsCcPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsCcPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsCcPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsCcPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsCcPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsCcPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsCcPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2606,6 +2407,13 @@ func (this *ActivityStreamsCcPropertyIterator) SetTootEmoji(v vocab.TootEmoji) {
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsCcPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsCcPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2660,10 +2468,6 @@ func (this *ActivityStreamsCcPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2672,10 +2476,6 @@ func (this *ActivityStreamsCcPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2712,6 +2512,10 @@ func (this *ActivityStreamsCcPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2796,10 +2600,6 @@ func (this *ActivityStreamsCcPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2820,10 +2620,6 @@ func (this *ActivityStreamsCcPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2836,14 +2632,6 @@ func (this *ActivityStreamsCcPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2886,10 +2674,8 @@ func (this *ActivityStreamsCcPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2899,6 +2685,7 @@ func (this *ActivityStreamsCcPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2920,18 +2707,14 @@ func (this *ActivityStreamsCcPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2969,14 +2752,10 @@ func (this ActivityStreamsCcPropertyIterator) serialize() (interface{}, error) {
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2995,6 +2774,8 @@ func (this ActivityStreamsCcPropertyIterator) serialize() (interface{}, error) {
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3037,8 +2818,6 @@ func (this ActivityStreamsCcPropertyIterator) serialize() (interface{}, error) {
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3049,18 +2828,12 @@ func (this ActivityStreamsCcPropertyIterator) serialize() (interface{}, error) {
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3738,73 +3511,6 @@ func (this *ActivityStreamsCcProperty) AppendActivityStreamsView(v vocab.Activit
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "cc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsCcProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "cc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsCcProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "cc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsCcProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsCcPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "cc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsCcProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsCcPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "cc". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsCcProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "cc". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsCcProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsCcPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "cc"
 func (this *ActivityStreamsCcProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsCcPropertyIterator{
@@ -3837,6 +3543,17 @@ func (this *ActivityStreamsCcProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "cc". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsCcProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsCcPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "cc". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsCcProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4811,108 +4528,6 @@ func (this *ActivityStreamsCcProperty) InsertActivityStreamsView(idx int, v voca
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "cc". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "cc". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "cc". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "cc". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "cc". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "cc". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "cc".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4964,6 +4579,23 @@ func (this *ActivityStreamsCcProperty) InsertTootEmoji(idx int, v vocab.TootEmoj
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "cc". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsCcProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsCcPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "cc". Existing elements at that index and higher are shifted
 // back once. Invalidates all iterators.
@@ -5087,210 +4719,190 @@ func (this ActivityStreamsCcProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6091,90 +5703,6 @@ func (this *ActivityStreamsCcProperty) PrependActivityStreamsView(v vocab.Activi
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "cc". Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsCcPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "cc". Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsCcPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "cc". Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsCcPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "cc". Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsCcPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "cc". Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsCcPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "cc". Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsCcPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "cc".
 func (this *ActivityStreamsCcProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsCcPropertyIterator{{
@@ -6216,6 +5744,20 @@ func (this *ActivityStreamsCcProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "cc". Invalidates all iterators.
+func (this *ActivityStreamsCcProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsCcPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "cc". Invalidates all iterators.
 func (this *ActivityStreamsCcProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6984,83 +6526,6 @@ func (this *ActivityStreamsCcProperty) SetActivityStreamsView(idx int, v vocab.A
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "cc". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsCcProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "cc". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsCcProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "cc". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "cc". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsCcProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "cc". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsCcProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "cc". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsCcProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsCcPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "cc".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsCcProperty) SetIRI(idx int, v *url.URL) {
@@ -7098,6 +6563,19 @@ func (this *ActivityStreamsCcProperty) SetTootEmoji(idx int, v vocab.TootEmoji)
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "cc". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsCcProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsCcPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "cc". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_closed/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_closed/gen_pkg.go
index 808cbdf51..3bc070d5e 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_closed/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_closed/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_closed/gen_property_activitystreams_closed.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_closed/gen_property_activitystreams_closed.go
index 76c758a41..b0d9c0bef 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_closed/gen_property_activitystreams_closed.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_closed/gen_property_activitystreams_closed.go
@@ -32,10 +32,8 @@ type ActivityStreamsClosedPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -45,6 +43,7 @@ type ActivityStreamsClosedPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -66,18 +65,14 @@ type ActivityStreamsClosedPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -183,12 +178,6 @@ func deserializeActivityStreamsClosedPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsClosedPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsClosedPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -201,12 +190,6 @@ func deserializeActivityStreamsClosedPropertyIterator(i interface{}, aliasMap ma
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsClosedPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsClosedPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -261,6 +244,12 @@ func deserializeActivityStreamsClosedPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsClosedPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsClosedPropertyIterator{
 				alias:                   alias,
@@ -387,12 +376,6 @@ func deserializeActivityStreamsClosedPropertyIterator(i interface{}, aliasMap ma
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsClosedPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsClosedPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -423,12 +406,6 @@ func deserializeActivityStreamsClosedPropertyIterator(i interface{}, aliasMap ma
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsClosedPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsClosedPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -447,18 +424,6 @@ func deserializeActivityStreamsClosedPropertyIterator(i interface{}, aliasMap ma
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsClosedPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsClosedPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsClosedPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -897,44 +862,6 @@ func (this ActivityStreamsClosedPropertyIterator) GetActivityStreamsView() vocab
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsClosedPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsClosedPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsClosedPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsClosedPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsClosedPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsClosedPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsClosedPropertyIterator) GetIRI() *url.URL {
@@ -954,6 +881,12 @@ func (this ActivityStreamsClosedPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsClosedPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -997,18 +930,12 @@ func (this ActivityStreamsClosedPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1036,6 +963,9 @@ func (this ActivityStreamsClosedPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1099,9 +1029,6 @@ func (this ActivityStreamsClosedPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1117,9 +1044,6 @@ func (this ActivityStreamsClosedPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1129,12 +1053,6 @@ func (this ActivityStreamsClosedPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1185,10 +1103,8 @@ func (this ActivityStreamsClosedPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1198,6 +1114,7 @@ func (this ActivityStreamsClosedPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1219,18 +1136,14 @@ func (this ActivityStreamsClosedPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1623,48 +1536,6 @@ func (this ActivityStreamsClosedPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsClosedPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsClosedPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsClosedPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsClosedPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsClosedPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsClosedPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsClosedPropertyIterator) IsIRI() bool {
@@ -1684,6 +1555,13 @@ func (this ActivityStreamsClosedPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsClosedPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1733,14 +1611,10 @@ func (this ActivityStreamsClosedPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1759,6 +1633,8 @@ func (this ActivityStreamsClosedPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1801,8 +1677,6 @@ func (this ActivityStreamsClosedPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1813,18 +1687,12 @@ func (this ActivityStreamsClosedPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1892,161 +1760,146 @@ func (this ActivityStreamsClosedPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 12
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 13
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 14
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 15
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 16
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 17
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 18
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 19
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 20
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 21
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 22
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 23
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 24
 	}
-	if this.IsActivityStreamsGroup() {
-		return 25
-	}
 	if this.IsTootIdentityProof() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsImage() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsInvite() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsJoin() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsLeave() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsLike() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsListen() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsMention() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsMove() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsNote() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOffer() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPage() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsPerson() {
-		return 43
+		return 42
 	}
 	if this.IsActivityStreamsPlace() {
-		return 44
+		return 43
 	}
 	if this.IsActivityStreamsProfile() {
-		return 45
+		return 44
 	}
 	if this.IsSchemaPropertyValue() {
-		return 46
-	}
-	if this.IsForgeFedPush() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRead() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsReject() {
-		return 50
+		return 48
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 51
+		return 49
 	}
 	if this.IsActivityStreamsRemove() {
-		return 52
-	}
-	if this.IsForgeFedRepository() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsService() {
-		return 54
+		return 51
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 55
+		return 52
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 56
-	}
-	if this.IsForgeFedTicket() {
-		return 57
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsTravel() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsUndo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 62
+		return 57
 	}
 	if this.IsActivityStreamsVideo() {
-		return 63
+		return 58
 	}
 	if this.IsActivityStreamsView() {
-		return 64
+		return 59
 	}
 	if this.IsIRI() {
 		return -2
@@ -2091,14 +1944,10 @@ func (this ActivityStreamsClosedPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2117,6 +1966,8 @@ func (this ActivityStreamsClosedPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2159,8 +2010,6 @@ func (this ActivityStreamsClosedPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2171,18 +2020,12 @@ func (this ActivityStreamsClosedPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2606,48 +2449,6 @@ func (this *ActivityStreamsClosedPropertyIterator) SetActivityStreamsView(v voca
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsClosedPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsClosedPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsClosedPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsClosedPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsClosedPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsClosedPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsClosedPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2668,6 +2469,13 @@ func (this *ActivityStreamsClosedPropertyIterator) SetTootEmoji(v vocab.TootEmoj
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsClosedPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsClosedPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2722,10 +2530,6 @@ func (this *ActivityStreamsClosedPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2734,10 +2538,6 @@ func (this *ActivityStreamsClosedPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2774,6 +2574,10 @@ func (this *ActivityStreamsClosedPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2858,10 +2662,6 @@ func (this *ActivityStreamsClosedPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2882,10 +2682,6 @@ func (this *ActivityStreamsClosedPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2898,14 +2694,6 @@ func (this *ActivityStreamsClosedPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2966,10 +2754,8 @@ func (this *ActivityStreamsClosedPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2979,6 +2765,7 @@ func (this *ActivityStreamsClosedPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -3000,18 +2787,14 @@ func (this *ActivityStreamsClosedPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -3053,14 +2836,10 @@ func (this ActivityStreamsClosedPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -3079,6 +2858,8 @@ func (this ActivityStreamsClosedPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3121,8 +2902,6 @@ func (this ActivityStreamsClosedPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3133,18 +2912,12 @@ func (this ActivityStreamsClosedPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3823,73 +3596,6 @@ func (this *ActivityStreamsClosedProperty) AppendActivityStreamsView(v vocab.Act
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "closed". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsClosedProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "closed". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsClosedProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "closed". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsClosedProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsClosedPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "closed". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsClosedProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsClosedPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "closed". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsClosedProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "closed". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsClosedProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsClosedPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "closed"
 func (this *ActivityStreamsClosedProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsClosedPropertyIterator{
@@ -3923,6 +3629,17 @@ func (this *ActivityStreamsClosedProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "closed". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsClosedProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsClosedPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "closed". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsClosedProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4921,108 +4638,6 @@ func (this *ActivityStreamsClosedProperty) InsertActivityStreamsView(idx int, v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "closed". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "closed". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "closed". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "closed". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "closed". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "closed". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "closed".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -5074,6 +4689,23 @@ func (this *ActivityStreamsClosedProperty) InsertTootEmoji(idx int, v vocab.Toot
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "closed". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsClosedProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsClosedPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "closed". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5241,210 +4873,190 @@ func (this ActivityStreamsClosedProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 13 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 24 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 63 {
+		} else if idx1 == 58 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 64 {
+		} else if idx1 == 59 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6245,90 +5857,6 @@ func (this *ActivityStreamsClosedProperty) PrependActivityStreamsView(v vocab.Ac
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "closed". Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsClosedPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "closed". Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsClosedPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "closed". Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsClosedPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "closed". Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsClosedPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "closed". Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsClosedPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "closed". Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsClosedPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "closed".
 func (this *ActivityStreamsClosedProperty) PrependIRI(v *url.URL) {
@@ -6371,6 +5899,20 @@ func (this *ActivityStreamsClosedProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "closed". Invalidates all iterators.
+func (this *ActivityStreamsClosedProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsClosedPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "closed". Invalidates all iterators.
 func (this *ActivityStreamsClosedProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -7169,83 +6711,6 @@ func (this *ActivityStreamsClosedProperty) SetActivityStreamsView(idx int, v voc
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "closed". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsClosedProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "closed". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsClosedProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "closed". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "closed". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsClosedProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "closed". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsClosedProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "closed". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsClosedProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsClosedPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "closed". Panics if the index is out of bounds.
 func (this *ActivityStreamsClosedProperty) SetIRI(idx int, v *url.URL) {
@@ -7283,6 +6748,19 @@ func (this *ActivityStreamsClosedProperty) SetTootEmoji(idx int, v vocab.TootEmo
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "closed". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsClosedProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsClosedPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "closed". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_context/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_context/gen_pkg.go
index 61ed14191..485c1e69c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_context/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_context/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_context/gen_property_activitystreams_context.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_context/gen_property_activitystreams_context.go
index 6562267ca..10b1ca935 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_context/gen_property_activitystreams_context.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_context/gen_property_activitystreams_context.go
@@ -25,10 +25,8 @@ type ActivityStreamsContextPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsContextPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsContextPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsContextPropertyIterator(i interface{}, aliasMap m
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsContextPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsContextPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsContextPropertyIterator(i interface{}, aliasMap m
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsContextPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsContextPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsContextPropertyIterator(i interface{}, aliasMap m
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsContextPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsContextPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsContextPropertyIterator(i interface{}, aliasMap m
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsContextPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsContextPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsContextPropertyIterator(i interface{}, aliasMap m
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsContextPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsContextPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsContextPropertyIterator(i interface{}, aliasMap m
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsContextPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsContextPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsContextPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsContextPropertyIterator) GetActivityStreamsView() voca
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsContextPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsContextPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsContextPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsContextPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsContextPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsContextPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsContextPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsContextPropertyIterator) GetTootEmoji() vocab.TootEmoj
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsContextPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsContextPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsContextPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsContextPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsContextPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsContextPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsContextPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsContextPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsContextPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsContextPropertyIterator) IsActivityStreamsView() bool
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsContextPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsContextPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsContextPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsContextPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsContextPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsContextPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsContextPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsContextPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsContextPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsContextPropertyIterator) JSONLDContext() map[string]st
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsContextPropertyIterator) JSONLDContext() map[string]st
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsContextPropertyIterator) JSONLDContext() map[string]st
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsContextPropertyIterator) JSONLDContext() map[string]st
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsContextPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsContextPropertyIterator) LessThan(o vocab.ActivityStre
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsContextPropertyIterator) LessThan(o vocab.ActivityStre
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsContextPropertyIterator) LessThan(o vocab.ActivityStre
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsContextPropertyIterator) LessThan(o vocab.ActivityStre
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsContextPropertyIterator) SetActivityStreamsView(v voc
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsContextPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsContextPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsContextPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsContextPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsContextPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsContextPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsContextPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsContextPropertyIterator) SetTootEmoji(v vocab.TootEmo
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsContextPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsContextPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsContextPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsContextPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsContextPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsContextPropertyIterator) SetType(t vocab.Type) error
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsContextPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsContextPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsContextPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsContextPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsContextPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsContextPropertyIterator) serialize() (interface{}, err
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsContextPropertyIterator) serialize() (interface{}, err
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsContextPropertyIterator) serialize() (interface{}, err
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsContextPropertyIterator) serialize() (interface{}, err
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3749,74 +3522,6 @@ func (this *ActivityStreamsContextProperty) AppendActivityStreamsView(v vocab.Ac
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "context". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsContextProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "context". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsContextProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "context". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsContextProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsContextPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "context". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsContextProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsContextPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "context". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsContextProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "context". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsContextProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsContextPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "context"
 func (this *ActivityStreamsContextProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsContextPropertyIterator{
@@ -3850,6 +3555,17 @@ func (this *ActivityStreamsContextProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "context". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsContextProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsContextPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "context". Invalidates iterators that are traversing using
 // Prev.
@@ -4825,108 +4541,6 @@ func (this *ActivityStreamsContextProperty) InsertActivityStreamsView(idx int, v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "context". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "context". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "context". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "context". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "context". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "context". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "context".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4978,6 +4592,23 @@ func (this *ActivityStreamsContextProperty) InsertTootEmoji(idx int, v vocab.Too
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "context". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsContextProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsContextPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "context". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5101,210 +4732,190 @@ func (this ActivityStreamsContextProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6105,90 +5716,6 @@ func (this *ActivityStreamsContextProperty) PrependActivityStreamsView(v vocab.A
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "context". Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsContextPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "context". Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsContextPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "context". Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsContextPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "context". Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsContextPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "context". Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsContextPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "context". Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsContextPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "context".
 func (this *ActivityStreamsContextProperty) PrependIRI(v *url.URL) {
@@ -6231,6 +5758,20 @@ func (this *ActivityStreamsContextProperty) PrependTootEmoji(v vocab.TootEmoji)
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "context". Invalidates all iterators.
+func (this *ActivityStreamsContextProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsContextPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "context". Invalidates all iterators.
 func (this *ActivityStreamsContextProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6999,83 +6540,6 @@ func (this *ActivityStreamsContextProperty) SetActivityStreamsView(idx int, v vo
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "context". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsContextProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "context". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsContextProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "context". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "context". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsContextProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "context". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsContextProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "context". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsContextProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsContextPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "context". Panics if the index is out of bounds.
 func (this *ActivityStreamsContextProperty) SetIRI(idx int, v *url.URL) {
@@ -7113,6 +6577,19 @@ func (this *ActivityStreamsContextProperty) SetTootEmoji(idx int, v vocab.TootEm
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "context". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsContextProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsContextPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "context". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_current/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_current/gen_pkg.go
index c05ce229c..2d9a984fc 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_current/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_current/gen_pkg.go
@@ -13,6 +13,9 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeLinkActivityStreams returns the deserialization method for
 	// the "ActivityStreamsLink" non-functional property in the vocabulary
 	// "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_current/gen_property_activitystreams_current.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_current/gen_property_activitystreams_current.go
index b5fd6c5db..feae71f76 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_current/gen_property_activitystreams_current.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_current/gen_property_activitystreams_current.go
@@ -16,6 +16,7 @@ import (
 type ActivityStreamsCurrentProperty struct {
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
 	activitystreamsLinkMember                  vocab.ActivityStreamsLink
+	tootHashtagMember                          vocab.TootHashtag
 	activitystreamsMentionMember               vocab.ActivityStreamsMention
 	activitystreamsOrderedCollectionPageMember vocab.ActivityStreamsOrderedCollectionPage
 	unknown                                    interface{}
@@ -63,6 +64,12 @@ func DeserializeCurrentProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                     alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsCurrentProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsCurrentProperty{
 					activitystreamsMentionMember: v,
@@ -96,6 +103,7 @@ func NewActivityStreamsCurrentProperty() *ActivityStreamsCurrentProperty {
 func (this *ActivityStreamsCurrentProperty) Clear() {
 	this.activitystreamsCollectionPageMember = nil
 	this.activitystreamsLinkMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.activitystreamsOrderedCollectionPageMember = nil
 	this.unknown = nil
@@ -136,6 +144,12 @@ func (this ActivityStreamsCurrentProperty) GetIRI() *url.URL {
 	return this.iri
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsCurrentProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsCurrentProperty) GetType() vocab.Type {
@@ -145,6 +159,9 @@ func (this ActivityStreamsCurrentProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -159,6 +176,7 @@ func (this ActivityStreamsCurrentProperty) GetType() vocab.Type {
 func (this ActivityStreamsCurrentProperty) HasAny() bool {
 	return this.IsActivityStreamsCollectionPage() ||
 		this.IsActivityStreamsLink() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention() ||
 		this.IsActivityStreamsOrderedCollectionPage() ||
 		this.iri != nil
@@ -200,6 +218,13 @@ func (this ActivityStreamsCurrentProperty) IsIRI() bool {
 	return this.iri != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsCurrentProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // JSONLDContext returns the JSONLD URIs required in the context string for this
 // property and the specific values that are set. The value in the map is the
 // alias used to import the property's value or values.
@@ -210,6 +235,8 @@ func (this ActivityStreamsCurrentProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
 	} else if this.IsActivityStreamsLink() {
 		child = this.GetActivityStreamsLink().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -236,12 +263,15 @@ func (this ActivityStreamsCurrentProperty) KindIndex() int {
 	if this.IsActivityStreamsLink() {
 		return 1
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 2
 	}
-	if this.IsActivityStreamsOrderedCollectionPage() {
+	if this.IsActivityStreamsMention() {
 		return 3
 	}
+	if this.IsActivityStreamsOrderedCollectionPage() {
+		return 4
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -263,6 +293,8 @@ func (this ActivityStreamsCurrentProperty) LessThan(o vocab.ActivityStreamsCurre
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().LessThan(o.GetActivityStreamsLink())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -291,6 +323,8 @@ func (this ActivityStreamsCurrentProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsCollectionPage().Serialize()
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -335,6 +369,13 @@ func (this *ActivityStreamsCurrentProperty) SetIRI(v *url.URL) {
 	this.iri = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsCurrentProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsCurrentProperty) SetType(t vocab.Type) error {
@@ -346,6 +387,10 @@ func (this *ActivityStreamsCurrentProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsLink(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_describes/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_describes/gen_pkg.go
index 7a7da574e..bed40ca0e 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_describes/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_describes/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -181,9 +173,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -204,10 +193,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -220,14 +205,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_describes/gen_property_activitystreams_describes.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_describes/gen_property_activitystreams_describes.go
index 88ce28caf..3d6633cc3 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_describes/gen_property_activitystreams_describes.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_describes/gen_property_activitystreams_describes.go
@@ -24,10 +24,8 @@ type ActivityStreamsDescribesProperty struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -57,18 +55,14 @@ type ActivityStreamsDescribesProperty struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -168,12 +162,6 @@ func DeserializeDescribesProperty(m map[string]interface{}, aliasMap map[string]
 					alias:                      alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsDescribesProperty{
-					alias:                alias,
-					forgefedBranchMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsDescribesProperty{
 					activitystreamsCollectionMember: v,
@@ -186,12 +174,6 @@ func DeserializeDescribesProperty(m map[string]interface{}, aliasMap map[string]
 					alias:                               alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsDescribesProperty{
-					alias:                alias,
-					forgefedCommitMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsDescribesProperty{
 					activitystreamsCreateMember: v,
@@ -366,12 +348,6 @@ func DeserializeDescribesProperty(m map[string]interface{}, aliasMap map[string]
 					schemaPropertyValueMember: v,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsDescribesProperty{
-					alias:              alias,
-					forgefedPushMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsDescribesProperty{
 					activitystreamsQuestionMember: v,
@@ -402,12 +378,6 @@ func DeserializeDescribesProperty(m map[string]interface{}, aliasMap map[string]
 					alias:                       alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsDescribesProperty{
-					alias:                    alias,
-					forgefedRepositoryMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsDescribesProperty{
 					activitystreamsServiceMember: v,
@@ -426,18 +396,6 @@ func DeserializeDescribesProperty(m map[string]interface{}, aliasMap map[string]
 					alias:                                alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsDescribesProperty{
-					alias:                alias,
-					forgefedTicketMember: v,
-				}
-				return this, nil
-			} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsDescribesProperty{
-					alias:                          alias,
-					forgefedTicketDependencyMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsDescribesProperty{
 					activitystreamsTombstoneMember: v,
@@ -503,10 +461,8 @@ func (this *ActivityStreamsDescribesProperty) Clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -536,18 +492,14 @@ func (this *ActivityStreamsDescribesProperty) Clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -922,44 +874,6 @@ func (this ActivityStreamsDescribesProperty) GetActivityStreamsView() vocab.Acti
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsDescribesProperty) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsDescribesProperty) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsDescribesProperty) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsDescribesProperty) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsDescribesProperty) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsDescribesProperty) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsDescribesProperty) GetIRI() *url.URL {
@@ -1019,18 +933,12 @@ func (this ActivityStreamsDescribesProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1118,9 +1026,6 @@ func (this ActivityStreamsDescribesProperty) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1136,9 +1041,6 @@ func (this ActivityStreamsDescribesProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1148,12 +1050,6 @@ func (this ActivityStreamsDescribesProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1188,10 +1084,8 @@ func (this ActivityStreamsDescribesProperty) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1221,18 +1115,14 @@ func (this ActivityStreamsDescribesProperty) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1611,48 +1501,6 @@ func (this ActivityStreamsDescribesProperty) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsDescribesProperty) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsDescribesProperty) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsDescribesProperty) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsDescribesProperty) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsDescribesProperty) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsDescribesProperty) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsDescribesProperty) IsIRI() bool {
@@ -1705,14 +1553,10 @@ func (this ActivityStreamsDescribesProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1771,8 +1615,6 @@ func (this ActivityStreamsDescribesProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1783,18 +1625,12 @@ func (this ActivityStreamsDescribesProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1853,158 +1689,140 @@ func (this ActivityStreamsDescribesProperty) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 9
 	}
-	if this.IsForgeFedBranch() {
-		return 10
-	}
 	if this.IsActivityStreamsCollection() {
-		return 11
+		return 10
 	}
 	if this.IsActivityStreamsCollectionPage() {
-		return 12
-	}
-	if this.IsForgeFedCommit() {
-		return 13
+		return 11
 	}
 	if this.IsActivityStreamsCreate() {
-		return 14
+		return 12
 	}
 	if this.IsActivityStreamsDelete() {
-		return 15
+		return 13
 	}
 	if this.IsActivityStreamsDislike() {
-		return 16
+		return 14
 	}
 	if this.IsActivityStreamsDocument() {
-		return 17
+		return 15
 	}
 	if this.IsTootEmoji() {
-		return 18
+		return 16
 	}
 	if this.IsActivityStreamsEvent() {
-		return 19
+		return 17
 	}
 	if this.IsActivityStreamsFlag() {
-		return 20
+		return 18
 	}
 	if this.IsActivityStreamsFollow() {
-		return 21
+		return 19
 	}
 	if this.IsActivityStreamsGroup() {
-		return 22
+		return 20
 	}
 	if this.IsTootIdentityProof() {
-		return 23
+		return 21
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 24
+		return 22
 	}
 	if this.IsActivityStreamsImage() {
-		return 25
+		return 23
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 26
+		return 24
 	}
 	if this.IsActivityStreamsInvite() {
-		return 27
+		return 25
 	}
 	if this.IsActivityStreamsJoin() {
-		return 28
+		return 26
 	}
 	if this.IsActivityStreamsLeave() {
-		return 29
+		return 27
 	}
 	if this.IsActivityStreamsLike() {
-		return 30
+		return 28
 	}
 	if this.IsActivityStreamsListen() {
-		return 31
+		return 29
 	}
 	if this.IsActivityStreamsMove() {
-		return 32
+		return 30
 	}
 	if this.IsActivityStreamsNote() {
-		return 33
+		return 31
 	}
 	if this.IsActivityStreamsOffer() {
-		return 34
+		return 32
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 35
+		return 33
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 36
+		return 34
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 37
+		return 35
 	}
 	if this.IsActivityStreamsPage() {
-		return 38
+		return 36
 	}
 	if this.IsActivityStreamsPerson() {
-		return 39
+		return 37
 	}
 	if this.IsActivityStreamsPlace() {
-		return 40
+		return 38
 	}
 	if this.IsActivityStreamsProfile() {
-		return 41
+		return 39
 	}
 	if this.IsSchemaPropertyValue() {
-		return 42
-	}
-	if this.IsForgeFedPush() {
-		return 43
+		return 40
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 44
+		return 41
 	}
 	if this.IsActivityStreamsRead() {
-		return 45
+		return 42
 	}
 	if this.IsActivityStreamsReject() {
-		return 46
+		return 43
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 47
+		return 44
 	}
 	if this.IsActivityStreamsRemove() {
-		return 48
-	}
-	if this.IsForgeFedRepository() {
-		return 49
+		return 45
 	}
 	if this.IsActivityStreamsService() {
-		return 50
+		return 46
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 51
+		return 47
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 52
-	}
-	if this.IsForgeFedTicket() {
-		return 53
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 54
+		return 48
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 55
+		return 49
 	}
 	if this.IsActivityStreamsTravel() {
-		return 56
+		return 50
 	}
 	if this.IsActivityStreamsUndo() {
-		return 57
+		return 51
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 58
+		return 52
 	}
 	if this.IsActivityStreamsVideo() {
-		return 59
+		return 53
 	}
 	if this.IsActivityStreamsView() {
-		return 60
+		return 54
 	}
 	if this.IsIRI() {
 		return -2
@@ -2043,14 +1861,10 @@ func (this ActivityStreamsDescribesProperty) LessThan(o vocab.ActivityStreamsDes
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2109,8 +1923,6 @@ func (this ActivityStreamsDescribesProperty) LessThan(o vocab.ActivityStreamsDes
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2121,18 +1933,12 @@ func (this ActivityStreamsDescribesProperty) LessThan(o vocab.ActivityStreamsDes
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2185,14 +1991,10 @@ func (this ActivityStreamsDescribesProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2251,8 +2053,6 @@ func (this ActivityStreamsDescribesProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -2263,18 +2063,12 @@ func (this ActivityStreamsDescribesProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -2657,48 +2451,6 @@ func (this *ActivityStreamsDescribesProperty) SetActivityStreamsView(v vocab.Act
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsDescribesProperty) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.Clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsDescribesProperty) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.Clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsDescribesProperty) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.Clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsDescribesProperty) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.Clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsDescribesProperty) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.Clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsDescribesProperty) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.Clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsDescribesProperty) SetIRI(v *url.URL) {
 	this.Clear()
@@ -2769,10 +2521,6 @@ func (this *ActivityStreamsDescribesProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2781,10 +2529,6 @@ func (this *ActivityStreamsDescribesProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2901,10 +2645,6 @@ func (this *ActivityStreamsDescribesProperty) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2925,10 +2665,6 @@ func (this *ActivityStreamsDescribesProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2941,14 +2677,6 @@ func (this *ActivityStreamsDescribesProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_first/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_first/gen_pkg.go
index 9ab75cc0a..f0177bc66 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_first/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_first/gen_pkg.go
@@ -13,6 +13,9 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeLinkActivityStreams returns the deserialization method for
 	// the "ActivityStreamsLink" non-functional property in the vocabulary
 	// "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_first/gen_property_activitystreams_first.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_first/gen_property_activitystreams_first.go
index c757647f7..7ec5616a1 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_first/gen_property_activitystreams_first.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_first/gen_property_activitystreams_first.go
@@ -16,6 +16,7 @@ import (
 type ActivityStreamsFirstProperty struct {
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
 	activitystreamsLinkMember                  vocab.ActivityStreamsLink
+	tootHashtagMember                          vocab.TootHashtag
 	activitystreamsMentionMember               vocab.ActivityStreamsMention
 	activitystreamsOrderedCollectionPageMember vocab.ActivityStreamsOrderedCollectionPage
 	unknown                                    interface{}
@@ -63,6 +64,12 @@ func DeserializeFirstProperty(m map[string]interface{}, aliasMap map[string]stri
 					alias:                     alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsFirstProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsFirstProperty{
 					activitystreamsMentionMember: v,
@@ -96,6 +103,7 @@ func NewActivityStreamsFirstProperty() *ActivityStreamsFirstProperty {
 func (this *ActivityStreamsFirstProperty) Clear() {
 	this.activitystreamsCollectionPageMember = nil
 	this.activitystreamsLinkMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.activitystreamsOrderedCollectionPageMember = nil
 	this.unknown = nil
@@ -136,6 +144,12 @@ func (this ActivityStreamsFirstProperty) GetIRI() *url.URL {
 	return this.iri
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsFirstProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsFirstProperty) GetType() vocab.Type {
@@ -145,6 +159,9 @@ func (this ActivityStreamsFirstProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -159,6 +176,7 @@ func (this ActivityStreamsFirstProperty) GetType() vocab.Type {
 func (this ActivityStreamsFirstProperty) HasAny() bool {
 	return this.IsActivityStreamsCollectionPage() ||
 		this.IsActivityStreamsLink() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention() ||
 		this.IsActivityStreamsOrderedCollectionPage() ||
 		this.iri != nil
@@ -200,6 +218,13 @@ func (this ActivityStreamsFirstProperty) IsIRI() bool {
 	return this.iri != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsFirstProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // JSONLDContext returns the JSONLD URIs required in the context string for this
 // property and the specific values that are set. The value in the map is the
 // alias used to import the property's value or values.
@@ -210,6 +235,8 @@ func (this ActivityStreamsFirstProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
 	} else if this.IsActivityStreamsLink() {
 		child = this.GetActivityStreamsLink().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -236,12 +263,15 @@ func (this ActivityStreamsFirstProperty) KindIndex() int {
 	if this.IsActivityStreamsLink() {
 		return 1
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 2
 	}
-	if this.IsActivityStreamsOrderedCollectionPage() {
+	if this.IsActivityStreamsMention() {
 		return 3
 	}
+	if this.IsActivityStreamsOrderedCollectionPage() {
+		return 4
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -263,6 +293,8 @@ func (this ActivityStreamsFirstProperty) LessThan(o vocab.ActivityStreamsFirstPr
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().LessThan(o.GetActivityStreamsLink())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -291,6 +323,8 @@ func (this ActivityStreamsFirstProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsCollectionPage().Serialize()
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -335,6 +369,13 @@ func (this *ActivityStreamsFirstProperty) SetIRI(v *url.URL) {
 	this.iri = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsFirstProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsFirstProperty) SetType(t vocab.Type) error {
@@ -346,6 +387,10 @@ func (this *ActivityStreamsFirstProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsLink(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_formertype/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_formertype/gen_pkg.go
index 4c0c3cb40..4850cc0aa 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_formertype/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_formertype/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -181,9 +173,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -204,10 +193,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -220,14 +205,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_formertype/gen_property_activitystreams_formerType.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_formertype/gen_property_activitystreams_formerType.go
index bed08ca9c..dce204fc4 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_formertype/gen_property_activitystreams_formerType.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_formertype/gen_property_activitystreams_formerType.go
@@ -27,10 +27,8 @@ type ActivityStreamsFormerTypePropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -60,18 +58,14 @@ type ActivityStreamsFormerTypePropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -171,12 +165,6 @@ func deserializeActivityStreamsFormerTypePropertyIterator(i interface{}, aliasMa
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsFormerTypePropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsFormerTypePropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -189,12 +177,6 @@ func deserializeActivityStreamsFormerTypePropertyIterator(i interface{}, aliasMa
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsFormerTypePropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsFormerTypePropertyIterator{
 				activitystreamsCreateMember: v,
@@ -369,12 +351,6 @@ func deserializeActivityStreamsFormerTypePropertyIterator(i interface{}, aliasMa
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsFormerTypePropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsFormerTypePropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -405,12 +381,6 @@ func deserializeActivityStreamsFormerTypePropertyIterator(i interface{}, aliasMa
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsFormerTypePropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsFormerTypePropertyIterator{
 				activitystreamsServiceMember: v,
@@ -429,18 +399,6 @@ func deserializeActivityStreamsFormerTypePropertyIterator(i interface{}, aliasMa
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsFormerTypePropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsFormerTypePropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsFormerTypePropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -858,44 +816,6 @@ func (this ActivityStreamsFormerTypePropertyIterator) GetActivityStreamsView() v
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsFormerTypePropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsFormerTypePropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsFormerTypePropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsFormerTypePropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsFormerTypePropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsFormerTypePropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsFormerTypePropertyIterator) GetIRI() *url.URL {
@@ -955,18 +875,12 @@ func (this ActivityStreamsFormerTypePropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1054,9 +968,6 @@ func (this ActivityStreamsFormerTypePropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1072,9 +983,6 @@ func (this ActivityStreamsFormerTypePropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1084,12 +992,6 @@ func (this ActivityStreamsFormerTypePropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1131,10 +1033,8 @@ func (this ActivityStreamsFormerTypePropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1164,18 +1064,14 @@ func (this ActivityStreamsFormerTypePropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1554,48 +1450,6 @@ func (this ActivityStreamsFormerTypePropertyIterator) IsActivityStreamsView() bo
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsFormerTypePropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsFormerTypePropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsFormerTypePropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsFormerTypePropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsFormerTypePropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsFormerTypePropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsFormerTypePropertyIterator) IsIRI() bool {
@@ -1655,14 +1509,10 @@ func (this ActivityStreamsFormerTypePropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1721,8 +1571,6 @@ func (this ActivityStreamsFormerTypePropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1733,18 +1581,12 @@ func (this ActivityStreamsFormerTypePropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1806,158 +1648,140 @@ func (this ActivityStreamsFormerTypePropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
-		return 11
-	}
 	if this.IsActivityStreamsCollection() {
-		return 12
+		return 11
 	}
 	if this.IsActivityStreamsCollectionPage() {
-		return 13
-	}
-	if this.IsForgeFedCommit() {
-		return 14
+		return 12
 	}
 	if this.IsActivityStreamsCreate() {
-		return 15
+		return 13
 	}
 	if this.IsActivityStreamsDelete() {
-		return 16
+		return 14
 	}
 	if this.IsActivityStreamsDislike() {
-		return 17
+		return 15
 	}
 	if this.IsActivityStreamsDocument() {
-		return 18
+		return 16
 	}
 	if this.IsTootEmoji() {
-		return 19
+		return 17
 	}
 	if this.IsActivityStreamsEvent() {
-		return 20
+		return 18
 	}
 	if this.IsActivityStreamsFlag() {
-		return 21
+		return 19
 	}
 	if this.IsActivityStreamsFollow() {
-		return 22
+		return 20
 	}
 	if this.IsActivityStreamsGroup() {
-		return 23
+		return 21
 	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 22
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 23
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 24
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 25
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 26
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 27
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 28
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 29
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 30
 	}
 	if this.IsActivityStreamsMove() {
-		return 33
+		return 31
 	}
 	if this.IsActivityStreamsNote() {
-		return 34
+		return 32
 	}
 	if this.IsActivityStreamsOffer() {
-		return 35
+		return 33
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 36
+		return 34
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 37
+		return 35
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 38
+		return 36
 	}
 	if this.IsActivityStreamsPage() {
-		return 39
+		return 37
 	}
 	if this.IsActivityStreamsPerson() {
-		return 40
+		return 38
 	}
 	if this.IsActivityStreamsPlace() {
-		return 41
+		return 39
 	}
 	if this.IsActivityStreamsProfile() {
-		return 42
+		return 40
 	}
 	if this.IsSchemaPropertyValue() {
-		return 43
-	}
-	if this.IsForgeFedPush() {
-		return 44
+		return 41
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 45
+		return 42
 	}
 	if this.IsActivityStreamsRead() {
-		return 46
+		return 43
 	}
 	if this.IsActivityStreamsReject() {
-		return 47
+		return 44
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 48
+		return 45
 	}
 	if this.IsActivityStreamsRemove() {
-		return 49
-	}
-	if this.IsForgeFedRepository() {
-		return 50
+		return 46
 	}
 	if this.IsActivityStreamsService() {
-		return 51
+		return 47
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 52
+		return 48
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 53
-	}
-	if this.IsForgeFedTicket() {
-		return 54
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 55
+		return 49
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 56
+		return 50
 	}
 	if this.IsActivityStreamsTravel() {
-		return 57
+		return 51
 	}
 	if this.IsActivityStreamsUndo() {
-		return 58
+		return 52
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 59
+		return 53
 	}
 	if this.IsActivityStreamsVideo() {
-		return 60
+		return 54
 	}
 	if this.IsActivityStreamsView() {
-		return 61
+		return 55
 	}
 	if this.IsIRI() {
 		return -2
@@ -1998,14 +1822,10 @@ func (this ActivityStreamsFormerTypePropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2064,8 +1884,6 @@ func (this ActivityStreamsFormerTypePropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2076,18 +1894,12 @@ func (this ActivityStreamsFormerTypePropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2497,48 +2309,6 @@ func (this *ActivityStreamsFormerTypePropertyIterator) SetActivityStreamsView(v
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsFormerTypePropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsFormerTypePropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsFormerTypePropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsFormerTypePropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsFormerTypePropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsFormerTypePropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsFormerTypePropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2609,10 +2379,6 @@ func (this *ActivityStreamsFormerTypePropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2621,10 +2387,6 @@ func (this *ActivityStreamsFormerTypePropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2741,10 +2503,6 @@ func (this *ActivityStreamsFormerTypePropertyIterator) SetType(t vocab.Type) err
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2765,10 +2523,6 @@ func (this *ActivityStreamsFormerTypePropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2781,14 +2535,6 @@ func (this *ActivityStreamsFormerTypePropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2839,10 +2585,8 @@ func (this *ActivityStreamsFormerTypePropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2872,18 +2616,14 @@ func (this *ActivityStreamsFormerTypePropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2921,14 +2661,10 @@ func (this ActivityStreamsFormerTypePropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2987,8 +2723,6 @@ func (this ActivityStreamsFormerTypePropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -2999,18 +2733,12 @@ func (this ActivityStreamsFormerTypePropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3675,74 +3403,6 @@ func (this *ActivityStreamsFormerTypeProperty) AppendActivityStreamsView(v vocab
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "formerType". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsFormerTypeProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "formerType". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsFormerTypeProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "formerType". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsFormerTypeProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsFormerTypePropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "formerType". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsFormerTypeProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsFormerTypePropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "formerType". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsFormerTypeProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "formerType". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsFormerTypeProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsFormerTypePropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property
 // "formerType"
 func (this *ActivityStreamsFormerTypeProperty) AppendIRI(v *url.URL) {
@@ -4731,108 +4391,6 @@ func (this *ActivityStreamsFormerTypeProperty) InsertActivityStreamsView(idx int
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "formerType". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "formerType". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "formerType". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "formerType". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "formerType". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "formerType". Existing elements at that
-// index and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "formerType".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -5025,206 +4583,182 @@ func (this ActivityStreamsFormerTypeProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -5997,90 +5531,6 @@ func (this *ActivityStreamsFormerTypeProperty) PrependActivityStreamsView(v voca
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "formerType". Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsFormerTypePropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "formerType". Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsFormerTypePropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "formerType". Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsFormerTypePropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "formerType". Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsFormerTypePropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "formerType". Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsFormerTypePropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "formerType". Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsFormerTypePropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "formerType".
 func (this *ActivityStreamsFormerTypeProperty) PrependIRI(v *url.URL) {
@@ -6880,84 +6330,6 @@ func (this *ActivityStreamsFormerTypeProperty) SetActivityStreamsView(idx int, v
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "formerType". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsFormerTypeProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "formerType". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsFormerTypeProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "formerType". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsFormerTypeProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "formerType". Panics if the index is out of bounds.
-// Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "formerType". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsFormerTypeProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "formerType". Panics if the index is out
-// of bounds. Invalidates all iterators.
-func (this *ActivityStreamsFormerTypeProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsFormerTypePropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "formerType". Panics if the index is out of bounds.
 func (this *ActivityStreamsFormerTypeProperty) SetIRI(idx int, v *url.URL) {
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_generator/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_generator/gen_pkg.go
index a5fa2401d..b1751ca5f 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_generator/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_generator/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_generator/gen_property_activitystreams_generator.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_generator/gen_property_activitystreams_generator.go
index 86de2932f..694914b3d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_generator/gen_property_activitystreams_generator.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_generator/gen_property_activitystreams_generator.go
@@ -25,10 +25,8 @@ type ActivityStreamsGeneratorPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsGeneratorPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsGeneratorPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsGeneratorPropertyIterator(i interface{}, aliasMap
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsGeneratorPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsGeneratorPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsGeneratorPropertyIterator(i interface{}, aliasMap
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsGeneratorPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsGeneratorPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsGeneratorPropertyIterator(i interface{}, aliasMap
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsGeneratorPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsGeneratorPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsGeneratorPropertyIterator(i interface{}, aliasMap
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsGeneratorPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsGeneratorPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsGeneratorPropertyIterator(i interface{}, aliasMap
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsGeneratorPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsGeneratorPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsGeneratorPropertyIterator(i interface{}, aliasMap
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsGeneratorPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsGeneratorPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsGeneratorPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsGeneratorPropertyIterator) GetActivityStreamsView() vo
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsGeneratorPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsGeneratorPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsGeneratorPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsGeneratorPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsGeneratorPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsGeneratorPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsGeneratorPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsGeneratorPropertyIterator) GetTootEmoji() vocab.TootEm
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsGeneratorPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsGeneratorPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsGeneratorPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsGeneratorPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsGeneratorPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsGeneratorPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsGeneratorPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsGeneratorPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsGeneratorPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsGeneratorPropertyIterator) IsActivityStreamsView() boo
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsGeneratorPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsGeneratorPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsGeneratorPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsGeneratorPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsGeneratorPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsGeneratorPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsGeneratorPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsGeneratorPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsGeneratorPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsGeneratorPropertyIterator) JSONLDContext() map[string]
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsGeneratorPropertyIterator) JSONLDContext() map[string]
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsGeneratorPropertyIterator) JSONLDContext() map[string]
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsGeneratorPropertyIterator) JSONLDContext() map[string]
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsGeneratorPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsGeneratorPropertyIterator) LessThan(o vocab.ActivitySt
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsGeneratorPropertyIterator) LessThan(o vocab.ActivitySt
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsGeneratorPropertyIterator) LessThan(o vocab.ActivitySt
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsGeneratorPropertyIterator) LessThan(o vocab.ActivitySt
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsGeneratorPropertyIterator) SetActivityStreamsView(v v
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsGeneratorPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsGeneratorPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsGeneratorPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsGeneratorPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsGeneratorPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsGeneratorPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsGeneratorPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsGeneratorPropertyIterator) SetTootEmoji(v vocab.TootE
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsGeneratorPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsGeneratorPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsGeneratorPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsGeneratorPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsGeneratorPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsGeneratorPropertyIterator) SetType(t vocab.Type) erro
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsGeneratorPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsGeneratorPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsGeneratorPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsGeneratorPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsGeneratorPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsGeneratorPropertyIterator) serialize() (interface{}, e
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsGeneratorPropertyIterator) serialize() (interface{}, e
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsGeneratorPropertyIterator) serialize() (interface{}, e
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsGeneratorPropertyIterator) serialize() (interface{}, e
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3749,74 +3522,6 @@ func (this *ActivityStreamsGeneratorProperty) AppendActivityStreamsView(v vocab.
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "generator". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsGeneratorProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "generator". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsGeneratorProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "generator". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsGeneratorProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsGeneratorPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "generator". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsGeneratorProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsGeneratorPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "generator". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsGeneratorProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "generator". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsGeneratorProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsGeneratorPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "generator"
 func (this *ActivityStreamsGeneratorProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsGeneratorPropertyIterator{
@@ -3850,6 +3555,17 @@ func (this *ActivityStreamsGeneratorProperty) AppendTootEmoji(v vocab.TootEmoji)
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "generator". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsGeneratorProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsGeneratorPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "generator". Invalidates iterators that are traversing using
 // Prev.
@@ -4825,108 +4541,6 @@ func (this *ActivityStreamsGeneratorProperty) InsertActivityStreamsView(idx int,
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "generator". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "generator". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "generator". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "generator". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "generator". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "generator". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "generator".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4978,6 +4592,23 @@ func (this *ActivityStreamsGeneratorProperty) InsertTootEmoji(idx int, v vocab.T
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "generator". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsGeneratorProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsGeneratorPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "generator". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5101,210 +4732,190 @@ func (this ActivityStreamsGeneratorProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6105,90 +5716,6 @@ func (this *ActivityStreamsGeneratorProperty) PrependActivityStreamsView(v vocab
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "generator". Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsGeneratorPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "generator". Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsGeneratorPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "generator". Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsGeneratorPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "generator". Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsGeneratorPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "generator". Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsGeneratorPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "generator". Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsGeneratorPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "generator".
 func (this *ActivityStreamsGeneratorProperty) PrependIRI(v *url.URL) {
@@ -6231,6 +5758,20 @@ func (this *ActivityStreamsGeneratorProperty) PrependTootEmoji(v vocab.TootEmoji
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "generator". Invalidates all iterators.
+func (this *ActivityStreamsGeneratorProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsGeneratorPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "generator". Invalidates all iterators.
 func (this *ActivityStreamsGeneratorProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6999,84 +6540,6 @@ func (this *ActivityStreamsGeneratorProperty) SetActivityStreamsView(idx int, v
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "generator". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsGeneratorProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "generator". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsGeneratorProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "generator". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsGeneratorProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "generator". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsGeneratorProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "generator". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsGeneratorProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "generator". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsGeneratorProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsGeneratorPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "generator". Panics if the index is out of bounds.
 func (this *ActivityStreamsGeneratorProperty) SetIRI(idx int, v *url.URL) {
@@ -7115,6 +6578,19 @@ func (this *ActivityStreamsGeneratorProperty) SetTootEmoji(idx int, v vocab.Toot
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "generator". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsGeneratorProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsGeneratorPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "generator". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_icon/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_icon/gen_pkg.go
index 4fef7455f..f779f2b0a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_icon/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_icon/gen_pkg.go
@@ -9,6 +9,9 @@ var mgr privateManager
 // privateManager abstracts the code-generated manager that provides access to
 // concrete implementations.
 type privateManager interface {
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeImageActivityStreams returns the deserialization method for
 	// the "ActivityStreamsImage" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_icon/gen_property_activitystreams_icon.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_icon/gen_property_activitystreams_icon.go
index d154a54bc..3677f0ff9 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_icon/gen_property_activitystreams_icon.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_icon/gen_property_activitystreams_icon.go
@@ -16,6 +16,7 @@ import (
 type ActivityStreamsIconPropertyIterator struct {
 	activitystreamsImageMember   vocab.ActivityStreamsImage
 	activitystreamsLinkMember    vocab.ActivityStreamsLink
+	tootHashtagMember            vocab.TootHashtag
 	activitystreamsMentionMember vocab.ActivityStreamsMention
 	unknown                      interface{}
 	iri                          *url.URL
@@ -62,6 +63,12 @@ func deserializeActivityStreamsIconPropertyIterator(i interface{}, aliasMap map[
 				alias:                     alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsIconPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsIconPropertyIterator{
 				activitystreamsMentionMember: v,
@@ -104,6 +111,12 @@ func (this ActivityStreamsIconPropertyIterator) GetIRI() *url.URL {
 	return this.iri
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsIconPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsIconPropertyIterator) GetType() vocab.Type {
@@ -113,6 +126,9 @@ func (this ActivityStreamsIconPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -124,6 +140,7 @@ func (this ActivityStreamsIconPropertyIterator) GetType() vocab.Type {
 func (this ActivityStreamsIconPropertyIterator) HasAny() bool {
 	return this.IsActivityStreamsImage() ||
 		this.IsActivityStreamsLink() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention() ||
 		this.iri != nil
 }
@@ -155,6 +172,13 @@ func (this ActivityStreamsIconPropertyIterator) IsIRI() bool {
 	return this.iri != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsIconPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // JSONLDContext returns the JSONLD URIs required in the context string for this
 // property and the specific values that are set. The value in the map is the
 // alias used to import the property's value or values.
@@ -165,6 +189,8 @@ func (this ActivityStreamsIconPropertyIterator) JSONLDContext() map[string]strin
 		child = this.GetActivityStreamsImage().JSONLDContext()
 	} else if this.IsActivityStreamsLink() {
 		child = this.GetActivityStreamsLink().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	}
@@ -189,9 +215,12 @@ func (this ActivityStreamsIconPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsLink() {
 		return 1
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 2
 	}
+	if this.IsActivityStreamsMention() {
+		return 3
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -213,6 +242,8 @@ func (this ActivityStreamsIconPropertyIterator) LessThan(o vocab.ActivityStreams
 		return this.GetActivityStreamsImage().LessThan(o.GetActivityStreamsImage())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().LessThan(o.GetActivityStreamsLink())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	} else if this.IsIRI() {
@@ -275,6 +306,13 @@ func (this *ActivityStreamsIconPropertyIterator) SetIRI(v *url.URL) {
 	this.iri = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsIconPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsIconPropertyIterator) SetType(t vocab.Type) error {
@@ -286,6 +324,10 @@ func (this *ActivityStreamsIconPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsLink(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
@@ -299,6 +341,7 @@ func (this *ActivityStreamsIconPropertyIterator) SetType(t vocab.Type) error {
 func (this *ActivityStreamsIconPropertyIterator) clear() {
 	this.activitystreamsImageMember = nil
 	this.activitystreamsLinkMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.unknown = nil
 	this.iri = nil
@@ -313,6 +356,8 @@ func (this ActivityStreamsIconPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsImage().Serialize()
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	} else if this.IsIRI() {
@@ -419,6 +464,17 @@ func (this *ActivityStreamsIconProperty) AppendIRI(v *url.URL) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "icon". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsIconProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsIconPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "icon". Invalidates iterators that are traversing using Prev.
 // Returns an error if the type is not a valid one to set for this property.
@@ -532,6 +588,23 @@ func (this *ActivityStreamsIconProperty) InsertIRI(idx int, v *url.URL) {
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "icon". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsIconProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsIconPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "icon". Invalidates all iterators. Returns an error if the type is
 // not a valid one to set for this property.
@@ -602,6 +675,10 @@ func (this ActivityStreamsIconProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsLink()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 2 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 3 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
@@ -699,6 +776,20 @@ func (this *ActivityStreamsIconProperty) PrependIRI(v *url.URL) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "icon". Invalidates all iterators.
+func (this *ActivityStreamsIconProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsIconPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "icon". Invalidates all iterators. Returns an error if the type is
 // not a valid one to set for this property.
@@ -802,6 +893,19 @@ func (this *ActivityStreamsIconProperty) SetIRI(idx int, v *url.URL) {
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "icon". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsIconProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsIconPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetType sets an arbitrary type value to the specified index of the property
 // "icon". Invalidates all iterators. Returns an error if the type is not a
 // valid one to set for this property. Panics if the index is out of bounds.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_image/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_image/gen_pkg.go
index 09ab5b927..dfcdb92a2 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_image/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_image/gen_pkg.go
@@ -9,6 +9,9 @@ var mgr privateManager
 // privateManager abstracts the code-generated manager that provides access to
 // concrete implementations.
 type privateManager interface {
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeImageActivityStreams returns the deserialization method for
 	// the "ActivityStreamsImage" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_image/gen_property_activitystreams_image.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_image/gen_property_activitystreams_image.go
index c9e7ee626..4650a8dd9 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_image/gen_property_activitystreams_image.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_image/gen_property_activitystreams_image.go
@@ -16,6 +16,7 @@ import (
 type ActivityStreamsImagePropertyIterator struct {
 	activitystreamsImageMember   vocab.ActivityStreamsImage
 	activitystreamsLinkMember    vocab.ActivityStreamsLink
+	tootHashtagMember            vocab.TootHashtag
 	activitystreamsMentionMember vocab.ActivityStreamsMention
 	unknown                      interface{}
 	iri                          *url.URL
@@ -62,6 +63,12 @@ func deserializeActivityStreamsImagePropertyIterator(i interface{}, aliasMap map
 				alias:                     alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsImagePropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsImagePropertyIterator{
 				activitystreamsMentionMember: v,
@@ -104,6 +111,12 @@ func (this ActivityStreamsImagePropertyIterator) GetIRI() *url.URL {
 	return this.iri
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsImagePropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsImagePropertyIterator) GetType() vocab.Type {
@@ -113,6 +126,9 @@ func (this ActivityStreamsImagePropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -124,6 +140,7 @@ func (this ActivityStreamsImagePropertyIterator) GetType() vocab.Type {
 func (this ActivityStreamsImagePropertyIterator) HasAny() bool {
 	return this.IsActivityStreamsImage() ||
 		this.IsActivityStreamsLink() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention() ||
 		this.iri != nil
 }
@@ -155,6 +172,13 @@ func (this ActivityStreamsImagePropertyIterator) IsIRI() bool {
 	return this.iri != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsImagePropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // JSONLDContext returns the JSONLD URIs required in the context string for this
 // property and the specific values that are set. The value in the map is the
 // alias used to import the property's value or values.
@@ -165,6 +189,8 @@ func (this ActivityStreamsImagePropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsImage().JSONLDContext()
 	} else if this.IsActivityStreamsLink() {
 		child = this.GetActivityStreamsLink().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	}
@@ -189,9 +215,12 @@ func (this ActivityStreamsImagePropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsLink() {
 		return 1
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 2
 	}
+	if this.IsActivityStreamsMention() {
+		return 3
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -213,6 +242,8 @@ func (this ActivityStreamsImagePropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsImage().LessThan(o.GetActivityStreamsImage())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().LessThan(o.GetActivityStreamsLink())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	} else if this.IsIRI() {
@@ -275,6 +306,13 @@ func (this *ActivityStreamsImagePropertyIterator) SetIRI(v *url.URL) {
 	this.iri = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsImagePropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsImagePropertyIterator) SetType(t vocab.Type) error {
@@ -286,6 +324,10 @@ func (this *ActivityStreamsImagePropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsLink(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
@@ -299,6 +341,7 @@ func (this *ActivityStreamsImagePropertyIterator) SetType(t vocab.Type) error {
 func (this *ActivityStreamsImagePropertyIterator) clear() {
 	this.activitystreamsImageMember = nil
 	this.activitystreamsLinkMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.unknown = nil
 	this.iri = nil
@@ -313,6 +356,8 @@ func (this ActivityStreamsImagePropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsImage().Serialize()
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	} else if this.IsIRI() {
@@ -419,6 +464,17 @@ func (this *ActivityStreamsImageProperty) AppendIRI(v *url.URL) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "image". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsImageProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsImagePropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "image". Invalidates iterators that are traversing using Prev.
 // Returns an error if the type is not a valid one to set for this property.
@@ -532,6 +588,23 @@ func (this *ActivityStreamsImageProperty) InsertIRI(idx int, v *url.URL) {
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "image". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsImageProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsImagePropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "image". Invalidates all iterators. Returns an error if the type
 // is not a valid one to set for this property.
@@ -602,6 +675,10 @@ func (this ActivityStreamsImageProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsLink()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 2 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 3 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
@@ -699,6 +776,20 @@ func (this *ActivityStreamsImageProperty) PrependIRI(v *url.URL) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "image". Invalidates all iterators.
+func (this *ActivityStreamsImageProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsImagePropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "image". Invalidates all iterators. Returns an error if the type
 // is not a valid one to set for this property.
@@ -802,6 +893,19 @@ func (this *ActivityStreamsImageProperty) SetIRI(idx int, v *url.URL) {
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "image". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsImageProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsImagePropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetType sets an arbitrary type value to the specified index of the property
 // "image". Invalidates all iterators. Returns an error if the type is not a
 // valid one to set for this property. Panics if the index is out of bounds.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_inreplyto/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_inreplyto/gen_pkg.go
index 5d02a13c6..b5db6370c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_inreplyto/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_inreplyto/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_inreplyto/gen_property_activitystreams_inReplyTo.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_inreplyto/gen_property_activitystreams_inReplyTo.go
index e83177476..1c5990643 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_inreplyto/gen_property_activitystreams_inReplyTo.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_inreplyto/gen_property_activitystreams_inReplyTo.go
@@ -25,10 +25,8 @@ type ActivityStreamsInReplyToPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsInReplyToPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsInReplyToPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsInReplyToPropertyIterator(i interface{}, aliasMap
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInReplyToPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInReplyToPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsInReplyToPropertyIterator(i interface{}, aliasMap
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInReplyToPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInReplyToPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsInReplyToPropertyIterator(i interface{}, aliasMap
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsInReplyToPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInReplyToPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsInReplyToPropertyIterator(i interface{}, aliasMap
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInReplyToPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInReplyToPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsInReplyToPropertyIterator(i interface{}, aliasMap
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInReplyToPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInReplyToPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsInReplyToPropertyIterator(i interface{}, aliasMap
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInReplyToPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInReplyToPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInReplyToPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsInReplyToPropertyIterator) GetActivityStreamsView() vo
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsInReplyToPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsInReplyToPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsInReplyToPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsInReplyToPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsInReplyToPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsInReplyToPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsInReplyToPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsInReplyToPropertyIterator) GetTootEmoji() vocab.TootEm
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsInReplyToPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsInReplyToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsInReplyToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsInReplyToPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsInReplyToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsInReplyToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsInReplyToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsInReplyToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsInReplyToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsInReplyToPropertyIterator) IsActivityStreamsView() boo
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsInReplyToPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsInReplyToPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsInReplyToPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsInReplyToPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsInReplyToPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsInReplyToPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsInReplyToPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsInReplyToPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsInReplyToPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsInReplyToPropertyIterator) JSONLDContext() map[string]
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsInReplyToPropertyIterator) JSONLDContext() map[string]
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsInReplyToPropertyIterator) JSONLDContext() map[string]
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsInReplyToPropertyIterator) JSONLDContext() map[string]
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsInReplyToPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsInReplyToPropertyIterator) LessThan(o vocab.ActivitySt
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsInReplyToPropertyIterator) LessThan(o vocab.ActivitySt
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsInReplyToPropertyIterator) LessThan(o vocab.ActivitySt
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsInReplyToPropertyIterator) LessThan(o vocab.ActivitySt
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsInReplyToPropertyIterator) SetActivityStreamsView(v v
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsInReplyToPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsInReplyToPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsInReplyToPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsInReplyToPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsInReplyToPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsInReplyToPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsInReplyToPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsInReplyToPropertyIterator) SetTootEmoji(v vocab.TootE
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsInReplyToPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsInReplyToPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsInReplyToPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsInReplyToPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsInReplyToPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsInReplyToPropertyIterator) SetType(t vocab.Type) erro
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsInReplyToPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsInReplyToPropertyIterator) SetType(t vocab.Type) erro
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsInReplyToPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsInReplyToPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsInReplyToPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsInReplyToPropertyIterator) serialize() (interface{}, e
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsInReplyToPropertyIterator) serialize() (interface{}, e
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsInReplyToPropertyIterator) serialize() (interface{}, e
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsInReplyToPropertyIterator) serialize() (interface{}, e
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3749,74 +3522,6 @@ func (this *ActivityStreamsInReplyToProperty) AppendActivityStreamsView(v vocab.
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "inReplyTo". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsInReplyToProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "inReplyTo". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsInReplyToProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "inReplyTo". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsInReplyToProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsInReplyToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "inReplyTo". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsInReplyToProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsInReplyToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "inReplyTo". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsInReplyToProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "inReplyTo". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsInReplyToProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsInReplyToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "inReplyTo"
 func (this *ActivityStreamsInReplyToProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsInReplyToPropertyIterator{
@@ -3850,6 +3555,17 @@ func (this *ActivityStreamsInReplyToProperty) AppendTootEmoji(v vocab.TootEmoji)
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "inReplyTo". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsInReplyToProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsInReplyToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "inReplyTo". Invalidates iterators that are traversing using
 // Prev.
@@ -4825,108 +4541,6 @@ func (this *ActivityStreamsInReplyToProperty) InsertActivityStreamsView(idx int,
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "inReplyTo". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "inReplyTo". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "inReplyTo". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "inReplyTo". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "inReplyTo". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "inReplyTo". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "inReplyTo".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4978,6 +4592,23 @@ func (this *ActivityStreamsInReplyToProperty) InsertTootEmoji(idx int, v vocab.T
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "inReplyTo". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsInReplyToProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsInReplyToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "inReplyTo". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5101,210 +4732,190 @@ func (this ActivityStreamsInReplyToProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6105,90 +5716,6 @@ func (this *ActivityStreamsInReplyToProperty) PrependActivityStreamsView(v vocab
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "inReplyTo". Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsInReplyToPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "inReplyTo". Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsInReplyToPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "inReplyTo". Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsInReplyToPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "inReplyTo". Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsInReplyToPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "inReplyTo". Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsInReplyToPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "inReplyTo". Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsInReplyToPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "inReplyTo".
 func (this *ActivityStreamsInReplyToProperty) PrependIRI(v *url.URL) {
@@ -6231,6 +5758,20 @@ func (this *ActivityStreamsInReplyToProperty) PrependTootEmoji(v vocab.TootEmoji
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "inReplyTo". Invalidates all iterators.
+func (this *ActivityStreamsInReplyToProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsInReplyToPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "inReplyTo". Invalidates all iterators.
 func (this *ActivityStreamsInReplyToProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6999,84 +6540,6 @@ func (this *ActivityStreamsInReplyToProperty) SetActivityStreamsView(idx int, v
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "inReplyTo". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsInReplyToProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "inReplyTo". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsInReplyToProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "inReplyTo". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsInReplyToProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "inReplyTo". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsInReplyToProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "inReplyTo". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsInReplyToProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "inReplyTo". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsInReplyToProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInReplyToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "inReplyTo". Panics if the index is out of bounds.
 func (this *ActivityStreamsInReplyToProperty) SetIRI(idx int, v *url.URL) {
@@ -7115,6 +6578,19 @@ func (this *ActivityStreamsInReplyToProperty) SetTootEmoji(idx int, v vocab.Toot
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "inReplyTo". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsInReplyToProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsInReplyToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "inReplyTo". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_instrument/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_instrument/gen_pkg.go
index 8437a4437..5a0c64d26 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_instrument/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_instrument/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_instrument/gen_property_activitystreams_instrument.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_instrument/gen_property_activitystreams_instrument.go
index b73e07395..d81fa8c80 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_instrument/gen_property_activitystreams_instrument.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_instrument/gen_property_activitystreams_instrument.go
@@ -25,10 +25,8 @@ type ActivityStreamsInstrumentPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsInstrumentPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsInstrumentPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsInstrumentPropertyIterator(i interface{}, aliasMa
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInstrumentPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInstrumentPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsInstrumentPropertyIterator(i interface{}, aliasMa
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInstrumentPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInstrumentPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsInstrumentPropertyIterator(i interface{}, aliasMa
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsInstrumentPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInstrumentPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsInstrumentPropertyIterator(i interface{}, aliasMa
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInstrumentPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInstrumentPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsInstrumentPropertyIterator(i interface{}, aliasMa
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInstrumentPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInstrumentPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsInstrumentPropertyIterator(i interface{}, aliasMa
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInstrumentPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsInstrumentPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsInstrumentPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsInstrumentPropertyIterator) GetActivityStreamsView() v
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsInstrumentPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsInstrumentPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsInstrumentPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsInstrumentPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsInstrumentPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsInstrumentPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsInstrumentPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsInstrumentPropertyIterator) GetTootEmoji() vocab.TootE
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsInstrumentPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsInstrumentPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsInstrumentPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsInstrumentPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsInstrumentPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsInstrumentPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsInstrumentPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsInstrumentPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsInstrumentPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsInstrumentPropertyIterator) IsActivityStreamsView() bo
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsInstrumentPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsInstrumentPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsInstrumentPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsInstrumentPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsInstrumentPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsInstrumentPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsInstrumentPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsInstrumentPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsInstrumentPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsInstrumentPropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsInstrumentPropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsInstrumentPropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsInstrumentPropertyIterator) JSONLDContext() map[string
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsInstrumentPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsInstrumentPropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsInstrumentPropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsInstrumentPropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsInstrumentPropertyIterator) LessThan(o vocab.ActivityS
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsInstrumentPropertyIterator) SetActivityStreamsView(v
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsInstrumentPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsInstrumentPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsInstrumentPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsInstrumentPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsInstrumentPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsInstrumentPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsInstrumentPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsInstrumentPropertyIterator) SetTootEmoji(v vocab.Toot
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsInstrumentPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsInstrumentPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsInstrumentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsInstrumentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsInstrumentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsInstrumentPropertyIterator) SetType(t vocab.Type) err
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsInstrumentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsInstrumentPropertyIterator) SetType(t vocab.Type) err
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsInstrumentPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsInstrumentPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsInstrumentPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsInstrumentPropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsInstrumentPropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsInstrumentPropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsInstrumentPropertyIterator) serialize() (interface{},
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3749,74 +3522,6 @@ func (this *ActivityStreamsInstrumentProperty) AppendActivityStreamsView(v vocab
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "instrument". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsInstrumentProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "instrument". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsInstrumentProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "instrument". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsInstrumentProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsInstrumentPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "instrument". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsInstrumentProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsInstrumentPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "instrument". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsInstrumentProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "instrument". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsInstrumentProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsInstrumentPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property
 // "instrument"
 func (this *ActivityStreamsInstrumentProperty) AppendIRI(v *url.URL) {
@@ -3851,6 +3556,17 @@ func (this *ActivityStreamsInstrumentProperty) AppendTootEmoji(v vocab.TootEmoji
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "instrument". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsInstrumentProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsInstrumentPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "instrument". Invalidates iterators that are traversing using
 // Prev.
@@ -4827,108 +4543,6 @@ func (this *ActivityStreamsInstrumentProperty) InsertActivityStreamsView(idx int
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "instrument". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "instrument". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "instrument". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "instrument". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "instrument". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "instrument". Existing elements at that
-// index and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "instrument".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4980,6 +4594,23 @@ func (this *ActivityStreamsInstrumentProperty) InsertTootEmoji(idx int, v vocab.
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "instrument". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsInstrumentProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsInstrumentPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "instrument". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5103,210 +4734,190 @@ func (this ActivityStreamsInstrumentProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6107,90 +5718,6 @@ func (this *ActivityStreamsInstrumentProperty) PrependActivityStreamsView(v voca
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "instrument". Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsInstrumentPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "instrument". Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsInstrumentPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "instrument". Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsInstrumentPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "instrument". Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsInstrumentPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "instrument". Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsInstrumentPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "instrument". Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsInstrumentPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "instrument".
 func (this *ActivityStreamsInstrumentProperty) PrependIRI(v *url.URL) {
@@ -6233,6 +5760,20 @@ func (this *ActivityStreamsInstrumentProperty) PrependTootEmoji(v vocab.TootEmoj
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "instrument". Invalidates all iterators.
+func (this *ActivityStreamsInstrumentProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsInstrumentPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "instrument". Invalidates all iterators.
 func (this *ActivityStreamsInstrumentProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -7001,84 +6542,6 @@ func (this *ActivityStreamsInstrumentProperty) SetActivityStreamsView(idx int, v
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "instrument". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsInstrumentProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "instrument". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsInstrumentProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "instrument". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsInstrumentProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "instrument". Panics if the index is out of bounds.
-// Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "instrument". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsInstrumentProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "instrument". Panics if the index is out
-// of bounds. Invalidates all iterators.
-func (this *ActivityStreamsInstrumentProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsInstrumentPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "instrument". Panics if the index is out of bounds.
 func (this *ActivityStreamsInstrumentProperty) SetIRI(idx int, v *url.URL) {
@@ -7117,6 +6580,19 @@ func (this *ActivityStreamsInstrumentProperty) SetTootEmoji(idx int, v vocab.Too
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "instrument". Panics if the index is out of bounds. Invalidates
+// all iterators.
+func (this *ActivityStreamsInstrumentProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsInstrumentPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "instrument". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_items/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_items/gen_pkg.go
index 3227d852d..770f94624 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_items/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_items/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_items/gen_property_activitystreams_items.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_items/gen_property_activitystreams_items.go
index c0dccff4f..5969389e0 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_items/gen_property_activitystreams_items.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_items/gen_property_activitystreams_items.go
@@ -25,10 +25,8 @@ type ActivityStreamsItemsPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsItemsPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsItemsPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsItemsPropertyIterator(i interface{}, aliasMap map
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsItemsPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsItemsPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsItemsPropertyIterator(i interface{}, aliasMap map
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsItemsPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsItemsPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsItemsPropertyIterator(i interface{}, aliasMap map
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsItemsPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsItemsPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsItemsPropertyIterator(i interface{}, aliasMap map
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsItemsPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsItemsPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsItemsPropertyIterator(i interface{}, aliasMap map
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsItemsPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsItemsPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsItemsPropertyIterator(i interface{}, aliasMap map
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsItemsPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsItemsPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsItemsPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsItemsPropertyIterator) GetActivityStreamsView() vocab.
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsItemsPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsItemsPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsItemsPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsItemsPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsItemsPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsItemsPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsItemsPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsItemsPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsItemsPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsItemsPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsItemsPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsItemsPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsItemsPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsItemsPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsItemsPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsItemsPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsItemsPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsItemsPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsItemsPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsItemsPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsItemsPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsItemsPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsItemsPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsItemsPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsItemsPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsItemsPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsItemsPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsItemsPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsItemsPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsItemsPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsItemsPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsItemsPropertyIterator) SetActivityStreamsView(v vocab
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsItemsPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsItemsPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsItemsPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsItemsPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsItemsPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsItemsPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsItemsPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsItemsPropertyIterator) SetTootEmoji(v vocab.TootEmoji
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsItemsPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsItemsPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsItemsPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsItemsPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsItemsPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsItemsPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsItemsPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsItemsPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsItemsPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsItemsPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsItemsPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsItemsPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsItemsPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsItemsPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsItemsPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3740,73 +3513,6 @@ func (this *ActivityStreamsItemsProperty) AppendActivityStreamsView(v vocab.Acti
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "items". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsItemsProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "items". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsItemsProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "items". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsItemsProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsItemsPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "items". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsItemsProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsItemsPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "items". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsItemsProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "items". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsItemsProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsItemsPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "items"
 func (this *ActivityStreamsItemsProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsItemsPropertyIterator{
@@ -3840,6 +3546,17 @@ func (this *ActivityStreamsItemsProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "items". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsItemsProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsItemsPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "items". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsItemsProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4814,108 +4531,6 @@ func (this *ActivityStreamsItemsProperty) InsertActivityStreamsView(idx int, v v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "items". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "items". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "items". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "items". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "items". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "items". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "items".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4967,6 +4582,23 @@ func (this *ActivityStreamsItemsProperty) InsertTootEmoji(idx int, v vocab.TootE
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "items". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsItemsProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsItemsPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "items". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5090,210 +4722,190 @@ func (this ActivityStreamsItemsProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6094,90 +5706,6 @@ func (this *ActivityStreamsItemsProperty) PrependActivityStreamsView(v vocab.Act
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "items". Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsItemsPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "items". Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsItemsPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "items". Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsItemsPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "items". Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsItemsPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "items". Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsItemsPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "items". Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsItemsPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "items".
 func (this *ActivityStreamsItemsProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsItemsPropertyIterator{{
@@ -6219,6 +5747,20 @@ func (this *ActivityStreamsItemsProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "items". Invalidates all iterators.
+func (this *ActivityStreamsItemsProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsItemsPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "items". Invalidates all iterators.
 func (this *ActivityStreamsItemsProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6987,83 +6529,6 @@ func (this *ActivityStreamsItemsProperty) SetActivityStreamsView(idx int, v voca
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "items". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsItemsProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "items". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsItemsProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "items". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "items". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsItemsProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "items". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsItemsProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "items". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsItemsProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsItemsPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "items".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsItemsProperty) SetIRI(idx int, v *url.URL) {
@@ -7101,6 +6566,19 @@ func (this *ActivityStreamsItemsProperty) SetTootEmoji(idx int, v vocab.TootEmoj
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "items". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsItemsProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsItemsPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "items". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_last/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_last/gen_pkg.go
index ec35fb846..9fd90d5c0 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_last/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_last/gen_pkg.go
@@ -13,6 +13,9 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeLinkActivityStreams returns the deserialization method for
 	// the "ActivityStreamsLink" non-functional property in the vocabulary
 	// "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_last/gen_property_activitystreams_last.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_last/gen_property_activitystreams_last.go
index b11746bce..eac321661 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_last/gen_property_activitystreams_last.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_last/gen_property_activitystreams_last.go
@@ -16,6 +16,7 @@ import (
 type ActivityStreamsLastProperty struct {
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
 	activitystreamsLinkMember                  vocab.ActivityStreamsLink
+	tootHashtagMember                          vocab.TootHashtag
 	activitystreamsMentionMember               vocab.ActivityStreamsMention
 	activitystreamsOrderedCollectionPageMember vocab.ActivityStreamsOrderedCollectionPage
 	unknown                                    interface{}
@@ -63,6 +64,12 @@ func DeserializeLastProperty(m map[string]interface{}, aliasMap map[string]strin
 					alias:                     alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsLastProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsLastProperty{
 					activitystreamsMentionMember: v,
@@ -96,6 +103,7 @@ func NewActivityStreamsLastProperty() *ActivityStreamsLastProperty {
 func (this *ActivityStreamsLastProperty) Clear() {
 	this.activitystreamsCollectionPageMember = nil
 	this.activitystreamsLinkMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.activitystreamsOrderedCollectionPageMember = nil
 	this.unknown = nil
@@ -136,6 +144,12 @@ func (this ActivityStreamsLastProperty) GetIRI() *url.URL {
 	return this.iri
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsLastProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsLastProperty) GetType() vocab.Type {
@@ -145,6 +159,9 @@ func (this ActivityStreamsLastProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -159,6 +176,7 @@ func (this ActivityStreamsLastProperty) GetType() vocab.Type {
 func (this ActivityStreamsLastProperty) HasAny() bool {
 	return this.IsActivityStreamsCollectionPage() ||
 		this.IsActivityStreamsLink() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention() ||
 		this.IsActivityStreamsOrderedCollectionPage() ||
 		this.iri != nil
@@ -200,6 +218,13 @@ func (this ActivityStreamsLastProperty) IsIRI() bool {
 	return this.iri != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsLastProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // JSONLDContext returns the JSONLD URIs required in the context string for this
 // property and the specific values that are set. The value in the map is the
 // alias used to import the property's value or values.
@@ -210,6 +235,8 @@ func (this ActivityStreamsLastProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
 	} else if this.IsActivityStreamsLink() {
 		child = this.GetActivityStreamsLink().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -236,12 +263,15 @@ func (this ActivityStreamsLastProperty) KindIndex() int {
 	if this.IsActivityStreamsLink() {
 		return 1
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 2
 	}
-	if this.IsActivityStreamsOrderedCollectionPage() {
+	if this.IsActivityStreamsMention() {
 		return 3
 	}
+	if this.IsActivityStreamsOrderedCollectionPage() {
+		return 4
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -263,6 +293,8 @@ func (this ActivityStreamsLastProperty) LessThan(o vocab.ActivityStreamsLastProp
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().LessThan(o.GetActivityStreamsLink())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -291,6 +323,8 @@ func (this ActivityStreamsLastProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsCollectionPage().Serialize()
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -335,6 +369,13 @@ func (this *ActivityStreamsLastProperty) SetIRI(v *url.URL) {
 	this.iri = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsLastProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsLastProperty) SetType(t vocab.Type) error {
@@ -346,6 +387,10 @@ func (this *ActivityStreamsLastProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsLink(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_location/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_location/gen_pkg.go
index 2150f8472..b5bb8b3b9 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_location/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_location/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_location/gen_property_activitystreams_location.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_location/gen_property_activitystreams_location.go
index cc21513b5..a56119ff5 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_location/gen_property_activitystreams_location.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_location/gen_property_activitystreams_location.go
@@ -25,10 +25,8 @@ type ActivityStreamsLocationPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsLocationPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsLocationPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsLocationPropertyIterator(i interface{}, aliasMap
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsLocationPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsLocationPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsLocationPropertyIterator(i interface{}, aliasMap
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsLocationPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsLocationPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsLocationPropertyIterator(i interface{}, aliasMap
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsLocationPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsLocationPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsLocationPropertyIterator(i interface{}, aliasMap
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsLocationPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsLocationPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsLocationPropertyIterator(i interface{}, aliasMap
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsLocationPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsLocationPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsLocationPropertyIterator(i interface{}, aliasMap
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsLocationPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsLocationPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsLocationPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsLocationPropertyIterator) GetActivityStreamsView() voc
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsLocationPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsLocationPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsLocationPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsLocationPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsLocationPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsLocationPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsLocationPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsLocationPropertyIterator) GetTootEmoji() vocab.TootEmo
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsLocationPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsLocationPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsLocationPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsLocationPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsLocationPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsLocationPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsLocationPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsLocationPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsLocationPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsLocationPropertyIterator) IsActivityStreamsView() bool
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsLocationPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsLocationPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsLocationPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsLocationPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsLocationPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsLocationPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsLocationPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsLocationPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsLocationPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsLocationPropertyIterator) JSONLDContext() map[string]s
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsLocationPropertyIterator) JSONLDContext() map[string]s
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsLocationPropertyIterator) JSONLDContext() map[string]s
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsLocationPropertyIterator) JSONLDContext() map[string]s
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsLocationPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsLocationPropertyIterator) LessThan(o vocab.ActivityStr
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsLocationPropertyIterator) LessThan(o vocab.ActivityStr
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsLocationPropertyIterator) LessThan(o vocab.ActivityStr
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsLocationPropertyIterator) LessThan(o vocab.ActivityStr
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsLocationPropertyIterator) SetActivityStreamsView(v vo
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsLocationPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsLocationPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsLocationPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsLocationPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsLocationPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsLocationPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsLocationPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsLocationPropertyIterator) SetTootEmoji(v vocab.TootEm
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsLocationPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsLocationPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsLocationPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsLocationPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsLocationPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsLocationPropertyIterator) SetType(t vocab.Type) error
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsLocationPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsLocationPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsLocationPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsLocationPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsLocationPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsLocationPropertyIterator) serialize() (interface{}, er
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsLocationPropertyIterator) serialize() (interface{}, er
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsLocationPropertyIterator) serialize() (interface{}, er
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsLocationPropertyIterator) serialize() (interface{}, er
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3749,74 +3522,6 @@ func (this *ActivityStreamsLocationProperty) AppendActivityStreamsView(v vocab.A
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "location". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsLocationProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "location". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsLocationProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "location". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsLocationProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsLocationPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "location". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsLocationProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsLocationPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "location". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsLocationProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "location". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsLocationProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsLocationPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "location"
 func (this *ActivityStreamsLocationProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsLocationPropertyIterator{
@@ -3850,6 +3555,17 @@ func (this *ActivityStreamsLocationProperty) AppendTootEmoji(v vocab.TootEmoji)
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "location". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsLocationProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsLocationPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "location". Invalidates iterators that are traversing using
 // Prev.
@@ -4825,108 +4541,6 @@ func (this *ActivityStreamsLocationProperty) InsertActivityStreamsView(idx int,
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "location". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "location". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "location". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "location". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "location". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "location". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "location".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4978,6 +4592,23 @@ func (this *ActivityStreamsLocationProperty) InsertTootEmoji(idx int, v vocab.To
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "location". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsLocationProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsLocationPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "location". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5101,210 +4732,190 @@ func (this ActivityStreamsLocationProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6105,90 +5716,6 @@ func (this *ActivityStreamsLocationProperty) PrependActivityStreamsView(v vocab.
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "location". Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsLocationPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "location". Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsLocationPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "location". Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsLocationPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "location". Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsLocationPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "location". Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsLocationPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "location". Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsLocationPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "location".
 func (this *ActivityStreamsLocationProperty) PrependIRI(v *url.URL) {
@@ -6231,6 +5758,20 @@ func (this *ActivityStreamsLocationProperty) PrependTootEmoji(v vocab.TootEmoji)
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "location". Invalidates all iterators.
+func (this *ActivityStreamsLocationProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsLocationPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "location". Invalidates all iterators.
 func (this *ActivityStreamsLocationProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6999,83 +6540,6 @@ func (this *ActivityStreamsLocationProperty) SetActivityStreamsView(idx int, v v
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "location". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsLocationProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "location". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsLocationProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "location". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "location". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsLocationProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "location". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsLocationProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "location". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsLocationProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsLocationPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "location". Panics if the index is out of bounds.
 func (this *ActivityStreamsLocationProperty) SetIRI(idx int, v *url.URL) {
@@ -7113,6 +6577,19 @@ func (this *ActivityStreamsLocationProperty) SetTootEmoji(idx int, v vocab.TootE
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "location". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsLocationProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsLocationPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "location". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_next/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_next/gen_pkg.go
index ba9278f5d..0ce6fcf06 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_next/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_next/gen_pkg.go
@@ -13,6 +13,9 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeLinkActivityStreams returns the deserialization method for
 	// the "ActivityStreamsLink" non-functional property in the vocabulary
 	// "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_next/gen_property_activitystreams_next.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_next/gen_property_activitystreams_next.go
index e78ad86b7..c1085c4a1 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_next/gen_property_activitystreams_next.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_next/gen_property_activitystreams_next.go
@@ -16,6 +16,7 @@ import (
 type ActivityStreamsNextProperty struct {
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
 	activitystreamsLinkMember                  vocab.ActivityStreamsLink
+	tootHashtagMember                          vocab.TootHashtag
 	activitystreamsMentionMember               vocab.ActivityStreamsMention
 	activitystreamsOrderedCollectionPageMember vocab.ActivityStreamsOrderedCollectionPage
 	unknown                                    interface{}
@@ -63,6 +64,12 @@ func DeserializeNextProperty(m map[string]interface{}, aliasMap map[string]strin
 					alias:                     alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsNextProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsNextProperty{
 					activitystreamsMentionMember: v,
@@ -96,6 +103,7 @@ func NewActivityStreamsNextProperty() *ActivityStreamsNextProperty {
 func (this *ActivityStreamsNextProperty) Clear() {
 	this.activitystreamsCollectionPageMember = nil
 	this.activitystreamsLinkMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.activitystreamsOrderedCollectionPageMember = nil
 	this.unknown = nil
@@ -136,6 +144,12 @@ func (this ActivityStreamsNextProperty) GetIRI() *url.URL {
 	return this.iri
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsNextProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsNextProperty) GetType() vocab.Type {
@@ -145,6 +159,9 @@ func (this ActivityStreamsNextProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -159,6 +176,7 @@ func (this ActivityStreamsNextProperty) GetType() vocab.Type {
 func (this ActivityStreamsNextProperty) HasAny() bool {
 	return this.IsActivityStreamsCollectionPage() ||
 		this.IsActivityStreamsLink() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention() ||
 		this.IsActivityStreamsOrderedCollectionPage() ||
 		this.iri != nil
@@ -200,6 +218,13 @@ func (this ActivityStreamsNextProperty) IsIRI() bool {
 	return this.iri != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsNextProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // JSONLDContext returns the JSONLD URIs required in the context string for this
 // property and the specific values that are set. The value in the map is the
 // alias used to import the property's value or values.
@@ -210,6 +235,8 @@ func (this ActivityStreamsNextProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
 	} else if this.IsActivityStreamsLink() {
 		child = this.GetActivityStreamsLink().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -236,12 +263,15 @@ func (this ActivityStreamsNextProperty) KindIndex() int {
 	if this.IsActivityStreamsLink() {
 		return 1
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 2
 	}
-	if this.IsActivityStreamsOrderedCollectionPage() {
+	if this.IsActivityStreamsMention() {
 		return 3
 	}
+	if this.IsActivityStreamsOrderedCollectionPage() {
+		return 4
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -263,6 +293,8 @@ func (this ActivityStreamsNextProperty) LessThan(o vocab.ActivityStreamsNextProp
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().LessThan(o.GetActivityStreamsLink())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -291,6 +323,8 @@ func (this ActivityStreamsNextProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsCollectionPage().Serialize()
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -335,6 +369,13 @@ func (this *ActivityStreamsNextProperty) SetIRI(v *url.URL) {
 	this.iri = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsNextProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsNextProperty) SetType(t vocab.Type) error {
@@ -346,6 +387,10 @@ func (this *ActivityStreamsNextProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsLink(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_object/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_object/gen_pkg.go
index d5a67da47..24de805a8 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_object/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_object/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_object/gen_property_activitystreams_object.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_object/gen_property_activitystreams_object.go
index 300c62a5f..03cb585ad 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_object/gen_property_activitystreams_object.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_object/gen_property_activitystreams_object.go
@@ -25,10 +25,8 @@ type ActivityStreamsObjectPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsObjectPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsObjectPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsObjectPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsObjectPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsObjectPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsObjectPropertyIterator(i interface{}, aliasMap ma
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsObjectPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsObjectPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsObjectPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsObjectPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsObjectPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsObjectPropertyIterator(i interface{}, aliasMap ma
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsObjectPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsObjectPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsObjectPropertyIterator(i interface{}, aliasMap ma
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsObjectPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsObjectPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsObjectPropertyIterator(i interface{}, aliasMap ma
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsObjectPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsObjectPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsObjectPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsObjectPropertyIterator) GetActivityStreamsView() vocab
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsObjectPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsObjectPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsObjectPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsObjectPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsObjectPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsObjectPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsObjectPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsObjectPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsObjectPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsObjectPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsObjectPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsObjectPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsObjectPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsObjectPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsObjectPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsObjectPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsObjectPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsObjectPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsObjectPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsObjectPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsObjectPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsObjectPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsObjectPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsObjectPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsObjectPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsObjectPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsObjectPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsObjectPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsObjectPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsObjectPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsObjectPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsObjectPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsObjectPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsObjectPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsObjectPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsObjectPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsObjectPropertyIterator) SetActivityStreamsView(v voca
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsObjectPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsObjectPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsObjectPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsObjectPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsObjectPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsObjectPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsObjectPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsObjectPropertyIterator) SetTootEmoji(v vocab.TootEmoj
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsObjectPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsObjectPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsObjectPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsObjectPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsObjectPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsObjectPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsObjectPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsObjectPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsObjectPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsObjectPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsObjectPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsObjectPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsObjectPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsObjectPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsObjectPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3740,73 +3513,6 @@ func (this *ActivityStreamsObjectProperty) AppendActivityStreamsView(v vocab.Act
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "object". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsObjectProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "object". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsObjectProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "object". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsObjectProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsObjectPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "object". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsObjectProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsObjectPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "object". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsObjectProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "object". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsObjectProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsObjectPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "object"
 func (this *ActivityStreamsObjectProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsObjectPropertyIterator{
@@ -3840,6 +3546,17 @@ func (this *ActivityStreamsObjectProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "object". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsObjectProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsObjectPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "object". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsObjectProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4814,108 +4531,6 @@ func (this *ActivityStreamsObjectProperty) InsertActivityStreamsView(idx int, v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "object". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "object". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "object". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "object". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "object". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "object". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "object".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4967,6 +4582,23 @@ func (this *ActivityStreamsObjectProperty) InsertTootEmoji(idx int, v vocab.Toot
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "object". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsObjectProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsObjectPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "object". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5090,210 +4722,190 @@ func (this ActivityStreamsObjectProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6094,90 +5706,6 @@ func (this *ActivityStreamsObjectProperty) PrependActivityStreamsView(v vocab.Ac
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "object". Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsObjectPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "object". Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsObjectPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "object". Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsObjectPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "object". Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsObjectPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "object". Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsObjectPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "object". Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsObjectPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "object".
 func (this *ActivityStreamsObjectProperty) PrependIRI(v *url.URL) {
@@ -6220,6 +5748,20 @@ func (this *ActivityStreamsObjectProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "object". Invalidates all iterators.
+func (this *ActivityStreamsObjectProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsObjectPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "object". Invalidates all iterators.
 func (this *ActivityStreamsObjectProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6988,83 +6530,6 @@ func (this *ActivityStreamsObjectProperty) SetActivityStreamsView(idx int, v voc
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "object". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsObjectProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "object". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsObjectProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "object". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "object". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsObjectProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "object". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsObjectProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "object". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsObjectProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsObjectPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "object". Panics if the index is out of bounds.
 func (this *ActivityStreamsObjectProperty) SetIRI(idx int, v *url.URL) {
@@ -7102,6 +6567,19 @@ func (this *ActivityStreamsObjectProperty) SetTootEmoji(idx int, v vocab.TootEmo
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "object". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsObjectProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsObjectPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "object". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_oneof/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_oneof/gen_pkg.go
index efff9b2a2..c1feafb7a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_oneof/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_oneof/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_oneof/gen_property_activitystreams_oneOf.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_oneof/gen_property_activitystreams_oneOf.go
index 911335734..438d2fc5b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_oneof/gen_property_activitystreams_oneOf.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_oneof/gen_property_activitystreams_oneOf.go
@@ -25,10 +25,8 @@ type ActivityStreamsOneOfPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsOneOfPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsOneOfPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsOneOfPropertyIterator(i interface{}, aliasMap map
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOneOfPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOneOfPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsOneOfPropertyIterator(i interface{}, aliasMap map
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOneOfPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOneOfPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsOneOfPropertyIterator(i interface{}, aliasMap map
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsOneOfPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOneOfPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsOneOfPropertyIterator(i interface{}, aliasMap map
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOneOfPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOneOfPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsOneOfPropertyIterator(i interface{}, aliasMap map
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOneOfPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOneOfPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsOneOfPropertyIterator(i interface{}, aliasMap map
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOneOfPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOneOfPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOneOfPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsOneOfPropertyIterator) GetActivityStreamsView() vocab.
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsOneOfPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsOneOfPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsOneOfPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsOneOfPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsOneOfPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsOneOfPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsOneOfPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsOneOfPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsOneOfPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsOneOfPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsOneOfPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsOneOfPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsOneOfPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsOneOfPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsOneOfPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsOneOfPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsOneOfPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsOneOfPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsOneOfPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsOneOfPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsOneOfPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsOneOfPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsOneOfPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsOneOfPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsOneOfPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsOneOfPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsOneOfPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsOneOfPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsOneOfPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsOneOfPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsOneOfPropertyIterator) JSONLDContext() map[string]stri
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsOneOfPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsOneOfPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsOneOfPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsOneOfPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsOneOfPropertyIterator) LessThan(o vocab.ActivityStream
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsOneOfPropertyIterator) SetActivityStreamsView(v vocab
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsOneOfPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsOneOfPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsOneOfPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsOneOfPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsOneOfPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsOneOfPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsOneOfPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsOneOfPropertyIterator) SetTootEmoji(v vocab.TootEmoji
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsOneOfPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsOneOfPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsOneOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsOneOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsOneOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsOneOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsOneOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsOneOfPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsOneOfPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsOneOfPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsOneOfPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsOneOfPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsOneOfPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsOneOfPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsOneOfPropertyIterator) serialize() (interface{}, error
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3740,73 +3513,6 @@ func (this *ActivityStreamsOneOfProperty) AppendActivityStreamsView(v vocab.Acti
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "oneOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOneOfProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "oneOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOneOfProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "oneOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOneOfProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsOneOfPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "oneOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOneOfProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsOneOfPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "oneOf". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOneOfProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "oneOf". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsOneOfProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsOneOfPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "oneOf"
 func (this *ActivityStreamsOneOfProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsOneOfPropertyIterator{
@@ -3840,6 +3546,17 @@ func (this *ActivityStreamsOneOfProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "oneOf". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsOneOfProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsOneOfPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "oneOf". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsOneOfProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4814,108 +4531,6 @@ func (this *ActivityStreamsOneOfProperty) InsertActivityStreamsView(idx int, v v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "oneOf". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "oneOf". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "oneOf". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "oneOf". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "oneOf". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "oneOf". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "oneOf".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4967,6 +4582,23 @@ func (this *ActivityStreamsOneOfProperty) InsertTootEmoji(idx int, v vocab.TootE
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "oneOf". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsOneOfProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsOneOfPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "oneOf". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5090,210 +4722,190 @@ func (this ActivityStreamsOneOfProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6094,90 +5706,6 @@ func (this *ActivityStreamsOneOfProperty) PrependActivityStreamsView(v vocab.Act
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "oneOf". Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsOneOfPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "oneOf". Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsOneOfPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "oneOf". Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsOneOfPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "oneOf". Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsOneOfPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "oneOf". Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsOneOfPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "oneOf". Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsOneOfPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "oneOf".
 func (this *ActivityStreamsOneOfProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsOneOfPropertyIterator{{
@@ -6219,6 +5747,20 @@ func (this *ActivityStreamsOneOfProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "oneOf". Invalidates all iterators.
+func (this *ActivityStreamsOneOfProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsOneOfPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "oneOf". Invalidates all iterators.
 func (this *ActivityStreamsOneOfProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6987,83 +6529,6 @@ func (this *ActivityStreamsOneOfProperty) SetActivityStreamsView(idx int, v voca
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "oneOf". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsOneOfProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "oneOf". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsOneOfProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "oneOf". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "oneOf". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsOneOfProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "oneOf". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsOneOfProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "oneOf". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsOneOfProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOneOfPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "oneOf".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsOneOfProperty) SetIRI(idx int, v *url.URL) {
@@ -7101,6 +6566,19 @@ func (this *ActivityStreamsOneOfProperty) SetTootEmoji(idx int, v vocab.TootEmoj
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "oneOf". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsOneOfProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsOneOfPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "oneOf". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_ordereditems/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_ordereditems/gen_pkg.go
index 7ff688747..e6c16e922 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_ordereditems/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_ordereditems/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_ordereditems/gen_property_activitystreams_orderedItems.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_ordereditems/gen_property_activitystreams_orderedItems.go
index 7b02ca385..d15265516 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_ordereditems/gen_property_activitystreams_orderedItems.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_ordereditems/gen_property_activitystreams_orderedItems.go
@@ -25,10 +25,8 @@ type ActivityStreamsOrderedItemsPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsOrderedItemsPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsOrderedItemsPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsOrderedItemsPropertyIterator(i interface{}, alias
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOrderedItemsPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOrderedItemsPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsOrderedItemsPropertyIterator(i interface{}, alias
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOrderedItemsPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOrderedItemsPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsOrderedItemsPropertyIterator(i interface{}, alias
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsOrderedItemsPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOrderedItemsPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsOrderedItemsPropertyIterator(i interface{}, alias
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOrderedItemsPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOrderedItemsPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsOrderedItemsPropertyIterator(i interface{}, alias
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOrderedItemsPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOrderedItemsPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsOrderedItemsPropertyIterator(i interface{}, alias
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOrderedItemsPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOrderedItemsPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOrderedItemsPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) GetActivityStreamsView()
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsOrderedItemsPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsOrderedItemsPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsOrderedItemsPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsOrderedItemsPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsOrderedItemsPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsOrderedItemsPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsOrderedItemsPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) GetTootEmoji() vocab.Too
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsOrderedItemsPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) IsActivityStreamsView()
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsOrderedItemsPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsOrderedItemsPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsOrderedItemsPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsOrderedItemsPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsOrderedItemsPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsOrderedItemsPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsOrderedItemsPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsOrderedItemsPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) SetActivityStreamsView(
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsOrderedItemsPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsOrderedItemsPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsOrderedItemsPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsOrderedItemsPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsOrderedItemsPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsOrderedItemsPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsOrderedItemsPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) SetTootEmoji(v vocab.To
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsOrderedItemsPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsOrderedItemsPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) SetType(t vocab.Type) e
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsOrderedItemsPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsOrderedItemsPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3785,77 +3558,6 @@ func (this *ActivityStreamsOrderedItemsProperty) AppendActivityStreamsView(v voc
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "orderedItems". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsOrderedItemsProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "orderedItems". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsOrderedItemsProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "orderedItems". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOrderedItemsProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "orderedItems". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsOrderedItemsProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "orderedItems". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsOrderedItemsProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "orderedItems". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsOrderedItemsProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property
 // "orderedItems"
 func (this *ActivityStreamsOrderedItemsProperty) AppendIRI(v *url.URL) {
@@ -3890,6 +3592,17 @@ func (this *ActivityStreamsOrderedItemsProperty) AppendTootEmoji(v vocab.TootEmo
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "orderedItems". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsOrderedItemsProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsOrderedItemsPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "orderedItems". Invalidates iterators that are traversing
 // using Prev.
@@ -4867,108 +4580,6 @@ func (this *ActivityStreamsOrderedItemsProperty) InsertActivityStreamsView(idx i
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "orderedItems". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "orderedItems". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "orderedItems". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "orderedItems". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "orderedItems". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "orderedItems". Existing elements at that
-// index and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property
 // "orderedItems". Existing elements at that index and higher are shifted back
 // once. Invalidates all iterators.
@@ -5020,6 +4631,23 @@ func (this *ActivityStreamsOrderedItemsProperty) InsertTootEmoji(idx int, v voca
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "orderedItems". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsOrderedItemsProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "orderedItems". Existing elements at that index and higher
 // are shifted back once. Invalidates all iterators.
@@ -5143,210 +4771,190 @@ func (this ActivityStreamsOrderedItemsProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6148,90 +5756,6 @@ func (this *ActivityStreamsOrderedItemsProperty) PrependActivityStreamsView(v vo
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "orderedItems". Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsOrderedItemsPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "orderedItems". Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsOrderedItemsPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "orderedItems". Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsOrderedItemsPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "orderedItems". Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsOrderedItemsPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "orderedItems". Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsOrderedItemsPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "orderedItems". Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsOrderedItemsPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "orderedItems".
 func (this *ActivityStreamsOrderedItemsProperty) PrependIRI(v *url.URL) {
@@ -6274,6 +5798,20 @@ func (this *ActivityStreamsOrderedItemsProperty) PrependTootEmoji(v vocab.TootEm
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "orderedItems". Invalidates all iterators.
+func (this *ActivityStreamsOrderedItemsProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsOrderedItemsPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "orderedItems". Invalidates all iterators.
 func (this *ActivityStreamsOrderedItemsProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -7042,84 +6580,6 @@ func (this *ActivityStreamsOrderedItemsProperty) SetActivityStreamsView(idx int,
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "orderedItems". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "orderedItems". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "orderedItems". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsOrderedItemsProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "orderedItems". Panics if the index is out of bounds.
-// Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "orderedItems". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "orderedItems". Panics if the index is out
-// of bounds. Invalidates all iterators.
-func (this *ActivityStreamsOrderedItemsProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "orderedItems". Panics if the index is out of bounds.
 func (this *ActivityStreamsOrderedItemsProperty) SetIRI(idx int, v *url.URL) {
@@ -7158,6 +6618,19 @@ func (this *ActivityStreamsOrderedItemsProperty) SetTootEmoji(idx int, v vocab.T
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "orderedItems". Panics if the index is out of bounds. Invalidates
+// all iterators.
+func (this *ActivityStreamsOrderedItemsProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsOrderedItemsPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "orderedItems". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_origin/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_origin/gen_pkg.go
index 7430de0e4..70c65b77d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_origin/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_origin/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_origin/gen_property_activitystreams_origin.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_origin/gen_property_activitystreams_origin.go
index b74a2162d..ce2b20ca9 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_origin/gen_property_activitystreams_origin.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_origin/gen_property_activitystreams_origin.go
@@ -25,10 +25,8 @@ type ActivityStreamsOriginPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsOriginPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsOriginPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsOriginPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOriginPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOriginPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsOriginPropertyIterator(i interface{}, aliasMap ma
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOriginPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOriginPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsOriginPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsOriginPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOriginPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsOriginPropertyIterator(i interface{}, aliasMap ma
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOriginPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOriginPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsOriginPropertyIterator(i interface{}, aliasMap ma
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOriginPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOriginPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsOriginPropertyIterator(i interface{}, aliasMap ma
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOriginPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsOriginPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsOriginPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsOriginPropertyIterator) GetActivityStreamsView() vocab
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsOriginPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsOriginPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsOriginPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsOriginPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsOriginPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsOriginPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsOriginPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsOriginPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsOriginPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsOriginPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsOriginPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsOriginPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsOriginPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsOriginPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsOriginPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsOriginPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsOriginPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsOriginPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsOriginPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsOriginPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsOriginPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsOriginPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsOriginPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsOriginPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsOriginPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsOriginPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsOriginPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsOriginPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsOriginPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsOriginPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsOriginPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsOriginPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsOriginPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsOriginPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsOriginPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsOriginPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsOriginPropertyIterator) SetActivityStreamsView(v voca
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsOriginPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsOriginPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsOriginPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsOriginPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsOriginPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsOriginPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsOriginPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsOriginPropertyIterator) SetTootEmoji(v vocab.TootEmoj
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsOriginPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsOriginPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsOriginPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsOriginPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsOriginPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsOriginPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsOriginPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsOriginPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsOriginPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsOriginPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsOriginPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsOriginPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsOriginPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsOriginPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsOriginPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3740,73 +3513,6 @@ func (this *ActivityStreamsOriginProperty) AppendActivityStreamsView(v vocab.Act
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "origin". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOriginProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "origin". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOriginProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "origin". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOriginProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsOriginPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "origin". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOriginProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsOriginPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "origin". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsOriginProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "origin". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsOriginProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsOriginPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "origin"
 func (this *ActivityStreamsOriginProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsOriginPropertyIterator{
@@ -3840,6 +3546,17 @@ func (this *ActivityStreamsOriginProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "origin". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsOriginProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsOriginPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "origin". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsOriginProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4814,108 +4531,6 @@ func (this *ActivityStreamsOriginProperty) InsertActivityStreamsView(idx int, v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "origin". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "origin". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "origin". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "origin". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "origin". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "origin". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "origin".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4967,6 +4582,23 @@ func (this *ActivityStreamsOriginProperty) InsertTootEmoji(idx int, v vocab.Toot
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "origin". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsOriginProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsOriginPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "origin". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5090,210 +4722,190 @@ func (this ActivityStreamsOriginProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6094,90 +5706,6 @@ func (this *ActivityStreamsOriginProperty) PrependActivityStreamsView(v vocab.Ac
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "origin". Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsOriginPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "origin". Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsOriginPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "origin". Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsOriginPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "origin". Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsOriginPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "origin". Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsOriginPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "origin". Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsOriginPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "origin".
 func (this *ActivityStreamsOriginProperty) PrependIRI(v *url.URL) {
@@ -6220,6 +5748,20 @@ func (this *ActivityStreamsOriginProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "origin". Invalidates all iterators.
+func (this *ActivityStreamsOriginProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsOriginPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "origin". Invalidates all iterators.
 func (this *ActivityStreamsOriginProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6988,83 +6530,6 @@ func (this *ActivityStreamsOriginProperty) SetActivityStreamsView(idx int, v voc
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "origin". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsOriginProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "origin". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsOriginProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "origin". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "origin". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsOriginProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "origin". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsOriginProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "origin". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsOriginProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsOriginPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "origin". Panics if the index is out of bounds.
 func (this *ActivityStreamsOriginProperty) SetIRI(idx int, v *url.URL) {
@@ -7102,6 +6567,19 @@ func (this *ActivityStreamsOriginProperty) SetTootEmoji(idx int, v vocab.TootEmo
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "origin". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsOriginProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsOriginPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "origin". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_partof/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_partof/gen_pkg.go
index d734ec47b..1970f5971 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_partof/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_partof/gen_pkg.go
@@ -17,6 +17,9 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeLinkActivityStreams returns the deserialization method for
 	// the "ActivityStreamsLink" non-functional property in the vocabulary
 	// "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_partof/gen_property_activitystreams_partOf.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_partof/gen_property_activitystreams_partOf.go
index a3a70ffa8..fb4e185f8 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_partof/gen_property_activitystreams_partOf.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_partof/gen_property_activitystreams_partOf.go
@@ -17,6 +17,7 @@ type ActivityStreamsPartOfProperty struct {
 	activitystreamsLinkMember                  vocab.ActivityStreamsLink
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
+	tootHashtagMember                          vocab.TootHashtag
 	activitystreamsMentionMember               vocab.ActivityStreamsMention
 	activitystreamsOrderedCollectionMember     vocab.ActivityStreamsOrderedCollection
 	activitystreamsOrderedCollectionPageMember vocab.ActivityStreamsOrderedCollectionPage
@@ -71,6 +72,12 @@ func DeserializePartOfProperty(m map[string]interface{}, aliasMap map[string]str
 					alias:                               alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsPartOfProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsPartOfProperty{
 					activitystreamsMentionMember: v,
@@ -111,6 +118,7 @@ func (this *ActivityStreamsPartOfProperty) Clear() {
 	this.activitystreamsLinkMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.activitystreamsOrderedCollectionMember = nil
 	this.activitystreamsOrderedCollectionPageMember = nil
@@ -166,6 +174,12 @@ func (this ActivityStreamsPartOfProperty) GetIRI() *url.URL {
 	return this.iri
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsPartOfProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsPartOfProperty) GetType() vocab.Type {
@@ -178,6 +192,9 @@ func (this ActivityStreamsPartOfProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -196,6 +213,7 @@ func (this ActivityStreamsPartOfProperty) HasAny() bool {
 	return this.IsActivityStreamsLink() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention() ||
 		this.IsActivityStreamsOrderedCollection() ||
 		this.IsActivityStreamsOrderedCollectionPage() ||
@@ -253,6 +271,13 @@ func (this ActivityStreamsPartOfProperty) IsIRI() bool {
 	return this.iri != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsPartOfProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // JSONLDContext returns the JSONLD URIs required in the context string for this
 // property and the specific values that are set. The value in the map is the
 // alias used to import the property's value or values.
@@ -265,6 +290,8 @@ func (this ActivityStreamsPartOfProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	} else if this.IsActivityStreamsOrderedCollection() {
@@ -296,15 +323,18 @@ func (this ActivityStreamsPartOfProperty) KindIndex() int {
 	if this.IsActivityStreamsCollectionPage() {
 		return 2
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 3
 	}
-	if this.IsActivityStreamsOrderedCollection() {
+	if this.IsActivityStreamsMention() {
 		return 4
 	}
-	if this.IsActivityStreamsOrderedCollectionPage() {
+	if this.IsActivityStreamsOrderedCollection() {
 		return 5
 	}
+	if this.IsActivityStreamsOrderedCollectionPage() {
+		return 6
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -328,6 +358,8 @@ func (this ActivityStreamsPartOfProperty) LessThan(o vocab.ActivityStreamsPartOf
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	} else if this.IsActivityStreamsOrderedCollection() {
@@ -360,6 +392,8 @@ func (this ActivityStreamsPartOfProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	} else if this.IsActivityStreamsOrderedCollection() {
@@ -420,6 +454,13 @@ func (this *ActivityStreamsPartOfProperty) SetIRI(v *url.URL) {
 	this.iri = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsPartOfProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsPartOfProperty) SetType(t vocab.Type) error {
@@ -435,6 +476,10 @@ func (this *ActivityStreamsPartOfProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_prev/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_prev/gen_pkg.go
index cbc1bb850..57d210f9b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_prev/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_prev/gen_pkg.go
@@ -13,6 +13,9 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeLinkActivityStreams returns the deserialization method for
 	// the "ActivityStreamsLink" non-functional property in the vocabulary
 	// "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_prev/gen_property_activitystreams_prev.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_prev/gen_property_activitystreams_prev.go
index d9bf488b5..d7058195a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_prev/gen_property_activitystreams_prev.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_prev/gen_property_activitystreams_prev.go
@@ -16,6 +16,7 @@ import (
 type ActivityStreamsPrevProperty struct {
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
 	activitystreamsLinkMember                  vocab.ActivityStreamsLink
+	tootHashtagMember                          vocab.TootHashtag
 	activitystreamsMentionMember               vocab.ActivityStreamsMention
 	activitystreamsOrderedCollectionPageMember vocab.ActivityStreamsOrderedCollectionPage
 	unknown                                    interface{}
@@ -63,6 +64,12 @@ func DeserializePrevProperty(m map[string]interface{}, aliasMap map[string]strin
 					alias:                     alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsPrevProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsPrevProperty{
 					activitystreamsMentionMember: v,
@@ -96,6 +103,7 @@ func NewActivityStreamsPrevProperty() *ActivityStreamsPrevProperty {
 func (this *ActivityStreamsPrevProperty) Clear() {
 	this.activitystreamsCollectionPageMember = nil
 	this.activitystreamsLinkMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.activitystreamsOrderedCollectionPageMember = nil
 	this.unknown = nil
@@ -136,6 +144,12 @@ func (this ActivityStreamsPrevProperty) GetIRI() *url.URL {
 	return this.iri
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsPrevProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsPrevProperty) GetType() vocab.Type {
@@ -145,6 +159,9 @@ func (this ActivityStreamsPrevProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -159,6 +176,7 @@ func (this ActivityStreamsPrevProperty) GetType() vocab.Type {
 func (this ActivityStreamsPrevProperty) HasAny() bool {
 	return this.IsActivityStreamsCollectionPage() ||
 		this.IsActivityStreamsLink() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention() ||
 		this.IsActivityStreamsOrderedCollectionPage() ||
 		this.iri != nil
@@ -200,6 +218,13 @@ func (this ActivityStreamsPrevProperty) IsIRI() bool {
 	return this.iri != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsPrevProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // JSONLDContext returns the JSONLD URIs required in the context string for this
 // property and the specific values that are set. The value in the map is the
 // alias used to import the property's value or values.
@@ -210,6 +235,8 @@ func (this ActivityStreamsPrevProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
 	} else if this.IsActivityStreamsLink() {
 		child = this.GetActivityStreamsLink().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -236,12 +263,15 @@ func (this ActivityStreamsPrevProperty) KindIndex() int {
 	if this.IsActivityStreamsLink() {
 		return 1
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 2
 	}
-	if this.IsActivityStreamsOrderedCollectionPage() {
+	if this.IsActivityStreamsMention() {
 		return 3
 	}
+	if this.IsActivityStreamsOrderedCollectionPage() {
+		return 4
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -263,6 +293,8 @@ func (this ActivityStreamsPrevProperty) LessThan(o vocab.ActivityStreamsPrevProp
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().LessThan(o.GetActivityStreamsLink())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -291,6 +323,8 @@ func (this ActivityStreamsPrevProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsCollectionPage().Serialize()
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	} else if this.IsActivityStreamsOrderedCollectionPage() {
@@ -335,6 +369,13 @@ func (this *ActivityStreamsPrevProperty) SetIRI(v *url.URL) {
 	this.iri = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsPrevProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsPrevProperty) SetType(t vocab.Type) error {
@@ -346,6 +387,10 @@ func (this *ActivityStreamsPrevProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsLink(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_preview/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_preview/gen_pkg.go
index 1805ec7e1..2cb23bc64 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_preview/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_preview/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_preview/gen_property_activitystreams_preview.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_preview/gen_property_activitystreams_preview.go
index 9782ef25c..7093fa009 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_preview/gen_property_activitystreams_preview.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_preview/gen_property_activitystreams_preview.go
@@ -25,10 +25,8 @@ type ActivityStreamsPreviewPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsPreviewPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsPreviewPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsPreviewPropertyIterator(i interface{}, aliasMap m
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsPreviewPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsPreviewPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsPreviewPropertyIterator(i interface{}, aliasMap m
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsPreviewPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsPreviewPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsPreviewPropertyIterator(i interface{}, aliasMap m
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsPreviewPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsPreviewPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsPreviewPropertyIterator(i interface{}, aliasMap m
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsPreviewPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsPreviewPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsPreviewPropertyIterator(i interface{}, aliasMap m
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsPreviewPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsPreviewPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsPreviewPropertyIterator(i interface{}, aliasMap m
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsPreviewPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsPreviewPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsPreviewPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsPreviewPropertyIterator) GetActivityStreamsView() voca
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsPreviewPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsPreviewPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsPreviewPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsPreviewPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsPreviewPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsPreviewPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsPreviewPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsPreviewPropertyIterator) GetTootEmoji() vocab.TootEmoj
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsPreviewPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsPreviewPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsPreviewPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsPreviewPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsPreviewPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsPreviewPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsPreviewPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsPreviewPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsPreviewPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsPreviewPropertyIterator) IsActivityStreamsView() bool
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsPreviewPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsPreviewPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsPreviewPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsPreviewPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsPreviewPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsPreviewPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsPreviewPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsPreviewPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsPreviewPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsPreviewPropertyIterator) JSONLDContext() map[string]st
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsPreviewPropertyIterator) JSONLDContext() map[string]st
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsPreviewPropertyIterator) JSONLDContext() map[string]st
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsPreviewPropertyIterator) JSONLDContext() map[string]st
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsPreviewPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsPreviewPropertyIterator) LessThan(o vocab.ActivityStre
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsPreviewPropertyIterator) LessThan(o vocab.ActivityStre
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsPreviewPropertyIterator) LessThan(o vocab.ActivityStre
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsPreviewPropertyIterator) LessThan(o vocab.ActivityStre
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsPreviewPropertyIterator) SetActivityStreamsView(v voc
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsPreviewPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsPreviewPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsPreviewPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsPreviewPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsPreviewPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsPreviewPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsPreviewPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsPreviewPropertyIterator) SetTootEmoji(v vocab.TootEmo
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsPreviewPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsPreviewPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsPreviewPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsPreviewPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsPreviewPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsPreviewPropertyIterator) SetType(t vocab.Type) error
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsPreviewPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsPreviewPropertyIterator) SetType(t vocab.Type) error
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsPreviewPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsPreviewPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsPreviewPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsPreviewPropertyIterator) serialize() (interface{}, err
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsPreviewPropertyIterator) serialize() (interface{}, err
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsPreviewPropertyIterator) serialize() (interface{}, err
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsPreviewPropertyIterator) serialize() (interface{}, err
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3749,74 +3522,6 @@ func (this *ActivityStreamsPreviewProperty) AppendActivityStreamsView(v vocab.Ac
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "preview". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsPreviewProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "preview". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsPreviewProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "preview". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsPreviewProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsPreviewPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "preview". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsPreviewProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsPreviewPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "preview". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsPreviewProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "preview". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsPreviewProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsPreviewPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "preview"
 func (this *ActivityStreamsPreviewProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsPreviewPropertyIterator{
@@ -3850,6 +3555,17 @@ func (this *ActivityStreamsPreviewProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "preview". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsPreviewProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsPreviewPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "preview". Invalidates iterators that are traversing using
 // Prev.
@@ -4825,108 +4541,6 @@ func (this *ActivityStreamsPreviewProperty) InsertActivityStreamsView(idx int, v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "preview". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "preview". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "preview". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "preview". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "preview". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "preview". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "preview".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4978,6 +4592,23 @@ func (this *ActivityStreamsPreviewProperty) InsertTootEmoji(idx int, v vocab.Too
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "preview". Existing elements at that index and higher are shifted back
+// once. Invalidates all iterators.
+func (this *ActivityStreamsPreviewProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsPreviewPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "preview". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5101,210 +4732,190 @@ func (this ActivityStreamsPreviewProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6105,90 +5716,6 @@ func (this *ActivityStreamsPreviewProperty) PrependActivityStreamsView(v vocab.A
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "preview". Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsPreviewPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "preview". Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsPreviewPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "preview". Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsPreviewPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "preview". Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsPreviewPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "preview". Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsPreviewPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "preview". Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsPreviewPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "preview".
 func (this *ActivityStreamsPreviewProperty) PrependIRI(v *url.URL) {
@@ -6231,6 +5758,20 @@ func (this *ActivityStreamsPreviewProperty) PrependTootEmoji(v vocab.TootEmoji)
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "preview". Invalidates all iterators.
+func (this *ActivityStreamsPreviewProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsPreviewPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "preview". Invalidates all iterators.
 func (this *ActivityStreamsPreviewProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6999,83 +6540,6 @@ func (this *ActivityStreamsPreviewProperty) SetActivityStreamsView(idx int, v vo
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "preview". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsPreviewProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "preview". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsPreviewProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "preview". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "preview". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsPreviewProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "preview". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsPreviewProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "preview". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsPreviewProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsPreviewPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "preview". Panics if the index is out of bounds.
 func (this *ActivityStreamsPreviewProperty) SetIRI(idx int, v *url.URL) {
@@ -7113,6 +6577,19 @@ func (this *ActivityStreamsPreviewProperty) SetTootEmoji(idx int, v vocab.TootEm
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "preview". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsPreviewProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsPreviewPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "preview". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_relationship/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_relationship/gen_pkg.go
index d7c16c04c..c82ba4ab0 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_relationship/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_relationship/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -181,9 +173,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -204,10 +193,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -220,14 +205,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_relationship/gen_property_activitystreams_relationship.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_relationship/gen_property_activitystreams_relationship.go
index e1ddc6a29..6adecdbfa 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_relationship/gen_property_activitystreams_relationship.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_relationship/gen_property_activitystreams_relationship.go
@@ -24,10 +24,8 @@ type ActivityStreamsRelationshipPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -57,18 +55,14 @@ type ActivityStreamsRelationshipPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -168,12 +162,6 @@ func deserializeActivityStreamsRelationshipPropertyIterator(i interface{}, alias
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsRelationshipPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsRelationshipPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -186,12 +174,6 @@ func deserializeActivityStreamsRelationshipPropertyIterator(i interface{}, alias
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsRelationshipPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsRelationshipPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -366,12 +348,6 @@ func deserializeActivityStreamsRelationshipPropertyIterator(i interface{}, alias
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsRelationshipPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsRelationshipPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -402,12 +378,6 @@ func deserializeActivityStreamsRelationshipPropertyIterator(i interface{}, alias
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsRelationshipPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsRelationshipPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -426,18 +396,6 @@ func deserializeActivityStreamsRelationshipPropertyIterator(i interface{}, alias
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsRelationshipPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsRelationshipPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsRelationshipPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -847,44 +805,6 @@ func (this ActivityStreamsRelationshipPropertyIterator) GetActivityStreamsView()
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsRelationshipPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsRelationshipPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsRelationshipPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsRelationshipPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsRelationshipPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsRelationshipPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsRelationshipPropertyIterator) GetIRI() *url.URL {
@@ -944,18 +864,12 @@ func (this ActivityStreamsRelationshipPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1043,9 +957,6 @@ func (this ActivityStreamsRelationshipPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1061,9 +972,6 @@ func (this ActivityStreamsRelationshipPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1073,12 +981,6 @@ func (this ActivityStreamsRelationshipPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1113,10 +1015,8 @@ func (this ActivityStreamsRelationshipPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1146,18 +1046,14 @@ func (this ActivityStreamsRelationshipPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1536,48 +1432,6 @@ func (this ActivityStreamsRelationshipPropertyIterator) IsActivityStreamsView()
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsRelationshipPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsRelationshipPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsRelationshipPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsRelationshipPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsRelationshipPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsRelationshipPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsRelationshipPropertyIterator) IsIRI() bool {
@@ -1630,14 +1484,10 @@ func (this ActivityStreamsRelationshipPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1696,8 +1546,6 @@ func (this ActivityStreamsRelationshipPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1708,18 +1556,12 @@ func (this ActivityStreamsRelationshipPropertyIterator) JSONLDContext() map[stri
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1778,158 +1620,140 @@ func (this ActivityStreamsRelationshipPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 9
 	}
-	if this.IsForgeFedBranch() {
-		return 10
-	}
 	if this.IsActivityStreamsCollection() {
-		return 11
+		return 10
 	}
 	if this.IsActivityStreamsCollectionPage() {
-		return 12
-	}
-	if this.IsForgeFedCommit() {
-		return 13
+		return 11
 	}
 	if this.IsActivityStreamsCreate() {
-		return 14
+		return 12
 	}
 	if this.IsActivityStreamsDelete() {
-		return 15
+		return 13
 	}
 	if this.IsActivityStreamsDislike() {
-		return 16
+		return 14
 	}
 	if this.IsActivityStreamsDocument() {
-		return 17
+		return 15
 	}
 	if this.IsTootEmoji() {
-		return 18
+		return 16
 	}
 	if this.IsActivityStreamsEvent() {
-		return 19
+		return 17
 	}
 	if this.IsActivityStreamsFlag() {
-		return 20
+		return 18
 	}
 	if this.IsActivityStreamsFollow() {
-		return 21
+		return 19
 	}
 	if this.IsActivityStreamsGroup() {
-		return 22
+		return 20
 	}
 	if this.IsTootIdentityProof() {
-		return 23
+		return 21
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 24
+		return 22
 	}
 	if this.IsActivityStreamsImage() {
-		return 25
+		return 23
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 26
+		return 24
 	}
 	if this.IsActivityStreamsInvite() {
-		return 27
+		return 25
 	}
 	if this.IsActivityStreamsJoin() {
-		return 28
+		return 26
 	}
 	if this.IsActivityStreamsLeave() {
-		return 29
+		return 27
 	}
 	if this.IsActivityStreamsLike() {
-		return 30
+		return 28
 	}
 	if this.IsActivityStreamsListen() {
-		return 31
+		return 29
 	}
 	if this.IsActivityStreamsMove() {
-		return 32
+		return 30
 	}
 	if this.IsActivityStreamsNote() {
-		return 33
+		return 31
 	}
 	if this.IsActivityStreamsOffer() {
-		return 34
+		return 32
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 35
+		return 33
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 36
+		return 34
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 37
+		return 35
 	}
 	if this.IsActivityStreamsPage() {
-		return 38
+		return 36
 	}
 	if this.IsActivityStreamsPerson() {
-		return 39
+		return 37
 	}
 	if this.IsActivityStreamsPlace() {
-		return 40
+		return 38
 	}
 	if this.IsActivityStreamsProfile() {
-		return 41
+		return 39
 	}
 	if this.IsSchemaPropertyValue() {
-		return 42
-	}
-	if this.IsForgeFedPush() {
-		return 43
+		return 40
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 44
+		return 41
 	}
 	if this.IsActivityStreamsRead() {
-		return 45
+		return 42
 	}
 	if this.IsActivityStreamsReject() {
-		return 46
+		return 43
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 47
+		return 44
 	}
 	if this.IsActivityStreamsRemove() {
-		return 48
-	}
-	if this.IsForgeFedRepository() {
-		return 49
+		return 45
 	}
 	if this.IsActivityStreamsService() {
-		return 50
+		return 46
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 51
+		return 47
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 52
-	}
-	if this.IsForgeFedTicket() {
-		return 53
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 54
+		return 48
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 55
+		return 49
 	}
 	if this.IsActivityStreamsTravel() {
-		return 56
+		return 50
 	}
 	if this.IsActivityStreamsUndo() {
-		return 57
+		return 51
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 58
+		return 52
 	}
 	if this.IsActivityStreamsVideo() {
-		return 59
+		return 53
 	}
 	if this.IsActivityStreamsView() {
-		return 60
+		return 54
 	}
 	if this.IsIRI() {
 		return -2
@@ -1968,14 +1792,10 @@ func (this ActivityStreamsRelationshipPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2034,8 +1854,6 @@ func (this ActivityStreamsRelationshipPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2046,18 +1864,12 @@ func (this ActivityStreamsRelationshipPropertyIterator) LessThan(o vocab.Activit
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2467,48 +2279,6 @@ func (this *ActivityStreamsRelationshipPropertyIterator) SetActivityStreamsView(
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsRelationshipPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsRelationshipPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsRelationshipPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsRelationshipPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsRelationshipPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsRelationshipPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsRelationshipPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2579,10 +2349,6 @@ func (this *ActivityStreamsRelationshipPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2591,10 +2357,6 @@ func (this *ActivityStreamsRelationshipPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2711,10 +2473,6 @@ func (this *ActivityStreamsRelationshipPropertyIterator) SetType(t vocab.Type) e
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2735,10 +2493,6 @@ func (this *ActivityStreamsRelationshipPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2751,14 +2505,6 @@ func (this *ActivityStreamsRelationshipPropertyIterator) SetType(t vocab.Type) e
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2800,10 +2546,8 @@ func (this *ActivityStreamsRelationshipPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2833,18 +2577,14 @@ func (this *ActivityStreamsRelationshipPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2880,14 +2620,10 @@ func (this ActivityStreamsRelationshipPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2946,8 +2682,6 @@ func (this ActivityStreamsRelationshipPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -2958,18 +2692,12 @@ func (this ActivityStreamsRelationshipPropertyIterator) serialize() (interface{}
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3669,77 +3397,6 @@ func (this *ActivityStreamsRelationshipProperty) AppendActivityStreamsView(v voc
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "relationship". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsRelationshipProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "relationship". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsRelationshipProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "relationship". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsRelationshipProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsRelationshipPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "relationship". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsRelationshipProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsRelationshipPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "relationship". Invalidates iterators that are traversing using
-// Prev.
-func (this *ActivityStreamsRelationshipProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "relationship". Invalidates iterators that are
-// traversing using Prev.
-func (this *ActivityStreamsRelationshipProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsRelationshipPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property
 // "relationship"
 func (this *ActivityStreamsRelationshipProperty) AppendIRI(v *url.URL) {
@@ -4717,108 +4374,6 @@ func (this *ActivityStreamsRelationshipProperty) InsertActivityStreamsView(idx i
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "relationship". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "relationship". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "relationship". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "relationship". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "relationship". Existing elements at that index and higher are
-// shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "relationship". Existing elements at that
-// index and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property
 // "relationship". Existing elements at that index and higher are shifted back
 // once. Invalidates all iterators.
@@ -4989,206 +4544,182 @@ func (this ActivityStreamsRelationshipProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 10 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 11 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
+		} else if idx1 == 11 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -5962,90 +5493,6 @@ func (this *ActivityStreamsRelationshipProperty) PrependActivityStreamsView(v vo
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "relationship". Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsRelationshipPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "relationship". Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsRelationshipPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "relationship". Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsRelationshipPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "relationship". Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsRelationshipPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "relationship". Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsRelationshipPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "relationship". Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsRelationshipPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "relationship".
 func (this *ActivityStreamsRelationshipProperty) PrependIRI(v *url.URL) {
@@ -6830,84 +6277,6 @@ func (this *ActivityStreamsRelationshipProperty) SetActivityStreamsView(idx int,
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "relationship". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsRelationshipProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "relationship". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsRelationshipProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "relationship". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsRelationshipProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "relationship". Panics if the index is out of bounds.
-// Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "relationship". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsRelationshipProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "relationship". Panics if the index is out
-// of bounds. Invalidates all iterators.
-func (this *ActivityStreamsRelationshipProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsRelationshipPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "relationship". Panics if the index is out of bounds.
 func (this *ActivityStreamsRelationshipProperty) SetIRI(idx int, v *url.URL) {
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_result/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_result/gen_pkg.go
index b4da9eb2c..46a869513 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_result/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_result/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_result/gen_property_activitystreams_result.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_result/gen_property_activitystreams_result.go
index ac8a047a5..15b868d14 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_result/gen_property_activitystreams_result.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_result/gen_property_activitystreams_result.go
@@ -25,10 +25,8 @@ type ActivityStreamsResultPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsResultPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsResultPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsResultPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsResultPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsResultPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsResultPropertyIterator(i interface{}, aliasMap ma
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsResultPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsResultPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsResultPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsResultPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsResultPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsResultPropertyIterator(i interface{}, aliasMap ma
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsResultPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsResultPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsResultPropertyIterator(i interface{}, aliasMap ma
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsResultPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsResultPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsResultPropertyIterator(i interface{}, aliasMap ma
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsResultPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsResultPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsResultPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsResultPropertyIterator) GetActivityStreamsView() vocab
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsResultPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsResultPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsResultPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsResultPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsResultPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsResultPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsResultPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsResultPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsResultPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsResultPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsResultPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsResultPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsResultPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsResultPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsResultPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsResultPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsResultPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsResultPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsResultPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsResultPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsResultPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsResultPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsResultPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsResultPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsResultPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsResultPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsResultPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsResultPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsResultPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsResultPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsResultPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsResultPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsResultPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsResultPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsResultPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsResultPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsResultPropertyIterator) SetActivityStreamsView(v voca
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsResultPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsResultPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsResultPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsResultPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsResultPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsResultPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsResultPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsResultPropertyIterator) SetTootEmoji(v vocab.TootEmoj
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsResultPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsResultPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsResultPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsResultPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsResultPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsResultPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsResultPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsResultPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsResultPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsResultPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsResultPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsResultPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsResultPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsResultPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsResultPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3740,73 +3513,6 @@ func (this *ActivityStreamsResultProperty) AppendActivityStreamsView(v vocab.Act
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "result". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsResultProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "result". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsResultProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "result". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsResultProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsResultPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "result". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsResultProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsResultPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "result". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsResultProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "result". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsResultProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsResultPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "result"
 func (this *ActivityStreamsResultProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsResultPropertyIterator{
@@ -3840,6 +3546,17 @@ func (this *ActivityStreamsResultProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "result". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsResultProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsResultPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "result". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsResultProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4814,108 +4531,6 @@ func (this *ActivityStreamsResultProperty) InsertActivityStreamsView(idx int, v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "result". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "result". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "result". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "result". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "result". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "result". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "result".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4967,6 +4582,23 @@ func (this *ActivityStreamsResultProperty) InsertTootEmoji(idx int, v vocab.Toot
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "result". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsResultProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsResultPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "result". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5090,210 +4722,190 @@ func (this ActivityStreamsResultProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6094,90 +5706,6 @@ func (this *ActivityStreamsResultProperty) PrependActivityStreamsView(v vocab.Ac
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "result". Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsResultPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "result". Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsResultPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "result". Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsResultPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "result". Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsResultPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "result". Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsResultPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "result". Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsResultPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "result".
 func (this *ActivityStreamsResultProperty) PrependIRI(v *url.URL) {
@@ -6220,6 +5748,20 @@ func (this *ActivityStreamsResultProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "result". Invalidates all iterators.
+func (this *ActivityStreamsResultProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsResultPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "result". Invalidates all iterators.
 func (this *ActivityStreamsResultProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6988,83 +6530,6 @@ func (this *ActivityStreamsResultProperty) SetActivityStreamsView(idx int, v voc
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "result". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsResultProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "result". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsResultProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "result". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "result". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsResultProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "result". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsResultProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "result". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsResultProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsResultPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "result". Panics if the index is out of bounds.
 func (this *ActivityStreamsResultProperty) SetIRI(idx int, v *url.URL) {
@@ -7102,6 +6567,19 @@ func (this *ActivityStreamsResultProperty) SetTootEmoji(idx int, v vocab.TootEmo
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "result". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsResultProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsResultPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "result". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_source/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_source/gen_pkg.go
index f84d1a427..ea054037a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_source/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_source/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_source/gen_property_activitystreams_source.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_source/gen_property_activitystreams_source.go
index 5cc532d2e..9b972dc36 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_source/gen_property_activitystreams_source.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_source/gen_property_activitystreams_source.go
@@ -25,10 +25,8 @@ type ActivityStreamsSourceProperty struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsSourceProperty struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsSourceProperty struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func DeserializeSourceProperty(m map[string]interface{}, aliasMap map[string]str
 					alias:                      alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSourceProperty{
-					alias:                alias,
-					forgefedBranchMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSourceProperty{
 					activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func DeserializeSourceProperty(m map[string]interface{}, aliasMap map[string]str
 					alias:                               alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSourceProperty{
-					alias:                alias,
-					forgefedCommitMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSourceProperty{
 					activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func DeserializeSourceProperty(m map[string]interface{}, aliasMap map[string]str
 					alias:                      alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsSourceProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSourceProperty{
 					alias:                   alias,
@@ -380,12 +369,6 @@ func DeserializeSourceProperty(m map[string]interface{}, aliasMap map[string]str
 					schemaPropertyValueMember: v,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSourceProperty{
-					alias:              alias,
-					forgefedPushMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSourceProperty{
 					activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func DeserializeSourceProperty(m map[string]interface{}, aliasMap map[string]str
 					alias:                       alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSourceProperty{
-					alias:                    alias,
-					forgefedRepositoryMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSourceProperty{
 					activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func DeserializeSourceProperty(m map[string]interface{}, aliasMap map[string]str
 					alias:                                alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSourceProperty{
-					alias:                alias,
-					forgefedTicketMember: v,
-				}
-				return this, nil
-			} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSourceProperty{
-					alias:                          alias,
-					forgefedTicketDependencyMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSourceProperty{
 					activitystreamsTombstoneMember: v,
@@ -518,10 +483,8 @@ func (this *ActivityStreamsSourceProperty) Clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -531,6 +494,7 @@ func (this *ActivityStreamsSourceProperty) Clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -552,18 +516,14 @@ func (this *ActivityStreamsSourceProperty) Clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -952,44 +912,6 @@ func (this ActivityStreamsSourceProperty) GetActivityStreamsView() vocab.Activit
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsSourceProperty) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsSourceProperty) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsSourceProperty) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsSourceProperty) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsSourceProperty) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsSourceProperty) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsSourceProperty) GetIRI() *url.URL {
@@ -1009,6 +931,12 @@ func (this ActivityStreamsSourceProperty) GetTootEmoji() vocab.TootEmoji {
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsSourceProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -1052,18 +980,12 @@ func (this ActivityStreamsSourceProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1091,6 +1013,9 @@ func (this ActivityStreamsSourceProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1154,9 +1079,6 @@ func (this ActivityStreamsSourceProperty) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1172,9 +1094,6 @@ func (this ActivityStreamsSourceProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1184,12 +1103,6 @@ func (this ActivityStreamsSourceProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1225,10 +1138,8 @@ func (this ActivityStreamsSourceProperty) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1238,6 +1149,7 @@ func (this ActivityStreamsSourceProperty) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1259,18 +1171,14 @@ func (this ActivityStreamsSourceProperty) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1663,48 +1571,6 @@ func (this ActivityStreamsSourceProperty) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsSourceProperty) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsSourceProperty) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsSourceProperty) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsSourceProperty) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsSourceProperty) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsSourceProperty) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsSourceProperty) IsIRI() bool {
@@ -1724,6 +1590,13 @@ func (this ActivityStreamsSourceProperty) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsSourceProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1759,14 +1632,10 @@ func (this ActivityStreamsSourceProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1785,6 +1654,8 @@ func (this ActivityStreamsSourceProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1827,8 +1698,6 @@ func (this ActivityStreamsSourceProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1839,18 +1708,12 @@ func (this ActivityStreamsSourceProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1912,161 +1775,146 @@ func (this ActivityStreamsSourceProperty) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2107,14 +1955,10 @@ func (this ActivityStreamsSourceProperty) LessThan(o vocab.ActivityStreamsSource
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2133,6 +1977,8 @@ func (this ActivityStreamsSourceProperty) LessThan(o vocab.ActivityStreamsSource
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2175,8 +2021,6 @@ func (this ActivityStreamsSourceProperty) LessThan(o vocab.ActivityStreamsSource
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2187,18 +2031,12 @@ func (this ActivityStreamsSourceProperty) LessThan(o vocab.ActivityStreamsSource
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2253,14 +2091,10 @@ func (this ActivityStreamsSourceProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2279,6 +2113,8 @@ func (this ActivityStreamsSourceProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -2321,8 +2157,6 @@ func (this ActivityStreamsSourceProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -2333,18 +2167,12 @@ func (this ActivityStreamsSourceProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -2741,48 +2569,6 @@ func (this *ActivityStreamsSourceProperty) SetActivityStreamsView(v vocab.Activi
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsSourceProperty) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.Clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsSourceProperty) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.Clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsSourceProperty) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.Clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsSourceProperty) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.Clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsSourceProperty) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.Clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsSourceProperty) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.Clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsSourceProperty) SetIRI(v *url.URL) {
 	this.Clear()
@@ -2803,6 +2589,13 @@ func (this *ActivityStreamsSourceProperty) SetTootEmoji(v vocab.TootEmoji) {
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsSourceProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsSourceProperty) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2857,10 +2650,6 @@ func (this *ActivityStreamsSourceProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2869,10 +2658,6 @@ func (this *ActivityStreamsSourceProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2909,6 +2694,10 @@ func (this *ActivityStreamsSourceProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2993,10 +2782,6 @@ func (this *ActivityStreamsSourceProperty) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -3017,10 +2802,6 @@ func (this *ActivityStreamsSourceProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -3033,14 +2814,6 @@ func (this *ActivityStreamsSourceProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_pkg.go
index 9708e08a1..1a5522d56 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_property_activitystreams_subject.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_property_activitystreams_subject.go
index 9904c54d0..300d95ed5 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_property_activitystreams_subject.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_subject/gen_property_activitystreams_subject.go
@@ -25,10 +25,8 @@ type ActivityStreamsSubjectProperty struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsSubjectProperty struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsSubjectProperty struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                      alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                alias,
-					forgefedBranchMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                               alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                alias,
-					forgefedCommitMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                      alias,
 				}
 				return this, nil
+			} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+				this := &ActivityStreamsSubjectProperty{
+					alias:             alias,
+					tootHashtagMember: v,
+				}
+				return this, nil
 			} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					alias:                   alias,
@@ -380,12 +369,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					schemaPropertyValueMember: v,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:              alias,
-					forgefedPushMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                       alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                    alias,
-					forgefedRepositoryMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func DeserializeSubjectProperty(m map[string]interface{}, aliasMap map[string]st
 					alias:                                alias,
 				}
 				return this, nil
-			} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                alias,
-					forgefedTicketMember: v,
-				}
-				return this, nil
-			} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-				this := &ActivityStreamsSubjectProperty{
-					alias:                          alias,
-					forgefedTicketDependencyMember: v,
-				}
-				return this, nil
 			} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 				this := &ActivityStreamsSubjectProperty{
 					activitystreamsTombstoneMember: v,
@@ -518,10 +483,8 @@ func (this *ActivityStreamsSubjectProperty) Clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -531,6 +494,7 @@ func (this *ActivityStreamsSubjectProperty) Clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -552,18 +516,14 @@ func (this *ActivityStreamsSubjectProperty) Clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -952,44 +912,6 @@ func (this ActivityStreamsSubjectProperty) GetActivityStreamsView() vocab.Activi
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsSubjectProperty) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsSubjectProperty) GetIRI() *url.URL {
@@ -1009,6 +931,12 @@ func (this ActivityStreamsSubjectProperty) GetTootEmoji() vocab.TootEmoji {
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsSubjectProperty) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -1052,18 +980,12 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1091,6 +1013,9 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1154,9 +1079,6 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1172,9 +1094,6 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1184,12 +1103,6 @@ func (this ActivityStreamsSubjectProperty) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1225,10 +1138,8 @@ func (this ActivityStreamsSubjectProperty) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1238,6 +1149,7 @@ func (this ActivityStreamsSubjectProperty) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1259,18 +1171,14 @@ func (this ActivityStreamsSubjectProperty) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1663,48 +1571,6 @@ func (this ActivityStreamsSubjectProperty) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsSubjectProperty) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsSubjectProperty) IsIRI() bool {
@@ -1724,6 +1590,13 @@ func (this ActivityStreamsSubjectProperty) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsSubjectProperty) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1759,14 +1632,10 @@ func (this ActivityStreamsSubjectProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1785,6 +1654,8 @@ func (this ActivityStreamsSubjectProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1827,8 +1698,6 @@ func (this ActivityStreamsSubjectProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1839,18 +1708,12 @@ func (this ActivityStreamsSubjectProperty) JSONLDContext() map[string]string {
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1912,161 +1775,146 @@ func (this ActivityStreamsSubjectProperty) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2107,14 +1955,10 @@ func (this ActivityStreamsSubjectProperty) LessThan(o vocab.ActivityStreamsSubje
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2133,6 +1977,8 @@ func (this ActivityStreamsSubjectProperty) LessThan(o vocab.ActivityStreamsSubje
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2175,8 +2021,6 @@ func (this ActivityStreamsSubjectProperty) LessThan(o vocab.ActivityStreamsSubje
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2187,18 +2031,12 @@ func (this ActivityStreamsSubjectProperty) LessThan(o vocab.ActivityStreamsSubje
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2253,14 +2091,10 @@ func (this ActivityStreamsSubjectProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2279,6 +2113,8 @@ func (this ActivityStreamsSubjectProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -2321,8 +2157,6 @@ func (this ActivityStreamsSubjectProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -2333,18 +2167,12 @@ func (this ActivityStreamsSubjectProperty) Serialize() (interface{}, error) {
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -2741,48 +2569,6 @@ func (this *ActivityStreamsSubjectProperty) SetActivityStreamsView(v vocab.Activ
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.Clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.Clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.Clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.Clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.Clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsSubjectProperty) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.Clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsSubjectProperty) SetIRI(v *url.URL) {
 	this.Clear()
@@ -2803,6 +2589,13 @@ func (this *ActivityStreamsSubjectProperty) SetTootEmoji(v vocab.TootEmoji) {
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsSubjectProperty) SetTootHashtag(v vocab.TootHashtag) {
+	this.Clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsSubjectProperty) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2857,10 +2650,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2869,10 +2658,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2909,6 +2694,10 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2993,10 +2782,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -3017,10 +2802,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -3033,14 +2814,6 @@ func (this *ActivityStreamsSubjectProperty) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_tag/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_tag/gen_pkg.go
index cde7aa8db..16eef045c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_tag/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_tag/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_tag/gen_property_activitystreams_tag.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_tag/gen_property_activitystreams_tag.go
index d72c3890b..2d5d7609d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_tag/gen_property_activitystreams_tag.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_tag/gen_property_activitystreams_tag.go
@@ -25,10 +25,8 @@ type ActivityStreamsTagPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsTagPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsTagPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -175,12 +170,6 @@ func deserializeActivityStreamsTagPropertyIterator(i interface{}, aliasMap map[s
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTagPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTagPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -193,12 +182,6 @@ func deserializeActivityStreamsTagPropertyIterator(i interface{}, aliasMap map[s
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTagPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTagPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -253,6 +236,12 @@ func deserializeActivityStreamsTagPropertyIterator(i interface{}, aliasMap map[s
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsTagPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTagPropertyIterator{
 				alias:                   alias,
@@ -379,12 +368,6 @@ func deserializeActivityStreamsTagPropertyIterator(i interface{}, aliasMap map[s
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTagPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTagPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -415,12 +398,6 @@ func deserializeActivityStreamsTagPropertyIterator(i interface{}, aliasMap map[s
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTagPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTagPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -439,18 +416,6 @@ func deserializeActivityStreamsTagPropertyIterator(i interface{}, aliasMap map[s
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTagPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTagPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTagPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -874,44 +839,6 @@ func (this ActivityStreamsTagPropertyIterator) GetActivityStreamsView() vocab.Ac
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsTagPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsTagPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsTagPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsTagPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsTagPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsTagPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsTagPropertyIterator) GetIRI() *url.URL {
@@ -931,6 +858,12 @@ func (this ActivityStreamsTagPropertyIterator) GetTootEmoji() vocab.TootEmoji {
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsTagPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -974,18 +907,12 @@ func (this ActivityStreamsTagPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1013,6 +940,9 @@ func (this ActivityStreamsTagPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1076,9 +1006,6 @@ func (this ActivityStreamsTagPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1094,9 +1021,6 @@ func (this ActivityStreamsTagPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1106,12 +1030,6 @@ func (this ActivityStreamsTagPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1147,10 +1065,8 @@ func (this ActivityStreamsTagPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1160,6 +1076,7 @@ func (this ActivityStreamsTagPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1181,18 +1098,14 @@ func (this ActivityStreamsTagPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1585,48 +1498,6 @@ func (this ActivityStreamsTagPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsTagPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsTagPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsTagPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsTagPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsTagPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsTagPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsTagPropertyIterator) IsIRI() bool {
@@ -1646,6 +1517,13 @@ func (this ActivityStreamsTagPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsTagPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1681,14 +1559,10 @@ func (this ActivityStreamsTagPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1707,6 +1581,8 @@ func (this ActivityStreamsTagPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1749,8 +1625,6 @@ func (this ActivityStreamsTagPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1761,18 +1635,12 @@ func (this ActivityStreamsTagPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1834,161 +1702,146 @@ func (this ActivityStreamsTagPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2029,14 +1882,10 @@ func (this ActivityStreamsTagPropertyIterator) LessThan(o vocab.ActivityStreamsT
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2055,6 +1904,8 @@ func (this ActivityStreamsTagPropertyIterator) LessThan(o vocab.ActivityStreamsT
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2097,8 +1948,6 @@ func (this ActivityStreamsTagPropertyIterator) LessThan(o vocab.ActivityStreamsT
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2109,18 +1958,12 @@ func (this ActivityStreamsTagPropertyIterator) LessThan(o vocab.ActivityStreamsT
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2544,48 +2387,6 @@ func (this *ActivityStreamsTagPropertyIterator) SetActivityStreamsView(v vocab.A
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsTagPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsTagPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsTagPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsTagPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsTagPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsTagPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsTagPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2606,6 +2407,13 @@ func (this *ActivityStreamsTagPropertyIterator) SetTootEmoji(v vocab.TootEmoji)
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsTagPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsTagPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2660,10 +2468,6 @@ func (this *ActivityStreamsTagPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2672,10 +2476,6 @@ func (this *ActivityStreamsTagPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2712,6 +2512,10 @@ func (this *ActivityStreamsTagPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2796,10 +2600,6 @@ func (this *ActivityStreamsTagPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2820,10 +2620,6 @@ func (this *ActivityStreamsTagPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2836,14 +2632,6 @@ func (this *ActivityStreamsTagPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2886,10 +2674,8 @@ func (this *ActivityStreamsTagPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2899,6 +2685,7 @@ func (this *ActivityStreamsTagPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2920,18 +2707,14 @@ func (this *ActivityStreamsTagPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2969,14 +2752,10 @@ func (this ActivityStreamsTagPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2995,6 +2774,8 @@ func (this ActivityStreamsTagPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3037,8 +2818,6 @@ func (this ActivityStreamsTagPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3049,18 +2828,12 @@ func (this ActivityStreamsTagPropertyIterator) serialize() (interface{}, error)
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3738,73 +3511,6 @@ func (this *ActivityStreamsTagProperty) AppendActivityStreamsView(v vocab.Activi
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "tag". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTagProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "tag". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTagProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "tag". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTagProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsTagPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "tag". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTagProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsTagPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "tag". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTagProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "tag". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsTagProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsTagPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "tag"
 func (this *ActivityStreamsTagProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsTagPropertyIterator{
@@ -3837,6 +3543,17 @@ func (this *ActivityStreamsTagProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "tag". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsTagProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsTagPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "tag". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsTagProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4811,108 +4528,6 @@ func (this *ActivityStreamsTagProperty) InsertActivityStreamsView(idx int, v voc
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "tag". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "tag". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "tag". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "tag". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "tag". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "tag". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "tag".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4964,6 +4579,23 @@ func (this *ActivityStreamsTagProperty) InsertTootEmoji(idx int, v vocab.TootEmo
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "tag". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsTagProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsTagPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "tag". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5087,210 +4719,190 @@ func (this ActivityStreamsTagProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6091,90 +5703,6 @@ func (this *ActivityStreamsTagProperty) PrependActivityStreamsView(v vocab.Activ
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "tag". Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsTagPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "tag". Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsTagPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "tag". Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsTagPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "tag". Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsTagPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "tag". Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsTagPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "tag". Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsTagPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "tag".
 func (this *ActivityStreamsTagProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsTagPropertyIterator{{
@@ -6216,6 +5744,20 @@ func (this *ActivityStreamsTagProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "tag". Invalidates all iterators.
+func (this *ActivityStreamsTagProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsTagPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "tag". Invalidates all iterators.
 func (this *ActivityStreamsTagProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6984,83 +6526,6 @@ func (this *ActivityStreamsTagProperty) SetActivityStreamsView(idx int, v vocab.
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "tag". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsTagProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "tag". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsTagProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "tag". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "tag". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsTagProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "tag". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsTagProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "tag". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsTagProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTagPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "tag".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsTagProperty) SetIRI(idx int, v *url.URL) {
@@ -7098,6 +6563,19 @@ func (this *ActivityStreamsTagProperty) SetTootEmoji(idx int, v vocab.TootEmoji)
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "tag". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsTagProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsTagPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "tag". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_target/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_target/gen_pkg.go
index ce55d83fd..d2db7b8fd 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_target/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_target/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_target/gen_property_activitystreams_target.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_target/gen_property_activitystreams_target.go
index 02fda0c75..60b01cf53 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_target/gen_property_activitystreams_target.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_target/gen_property_activitystreams_target.go
@@ -25,10 +25,8 @@ type ActivityStreamsTargetPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsTargetPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsTargetPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -176,12 +171,6 @@ func deserializeActivityStreamsTargetPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTargetPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTargetPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -194,12 +183,6 @@ func deserializeActivityStreamsTargetPropertyIterator(i interface{}, aliasMap ma
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTargetPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTargetPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -254,6 +237,12 @@ func deserializeActivityStreamsTargetPropertyIterator(i interface{}, aliasMap ma
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsTargetPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTargetPropertyIterator{
 				alias:                   alias,
@@ -380,12 +369,6 @@ func deserializeActivityStreamsTargetPropertyIterator(i interface{}, aliasMap ma
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTargetPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTargetPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -416,12 +399,6 @@ func deserializeActivityStreamsTargetPropertyIterator(i interface{}, aliasMap ma
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTargetPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTargetPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -440,18 +417,6 @@ func deserializeActivityStreamsTargetPropertyIterator(i interface{}, aliasMap ma
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTargetPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsTargetPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsTargetPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -875,44 +840,6 @@ func (this ActivityStreamsTargetPropertyIterator) GetActivityStreamsView() vocab
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsTargetPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsTargetPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsTargetPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsTargetPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsTargetPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsTargetPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsTargetPropertyIterator) GetIRI() *url.URL {
@@ -932,6 +859,12 @@ func (this ActivityStreamsTargetPropertyIterator) GetTootEmoji() vocab.TootEmoji
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsTargetPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -975,18 +908,12 @@ func (this ActivityStreamsTargetPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1014,6 +941,9 @@ func (this ActivityStreamsTargetPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1077,9 +1007,6 @@ func (this ActivityStreamsTargetPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1095,9 +1022,6 @@ func (this ActivityStreamsTargetPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1107,12 +1031,6 @@ func (this ActivityStreamsTargetPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1148,10 +1066,8 @@ func (this ActivityStreamsTargetPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1161,6 +1077,7 @@ func (this ActivityStreamsTargetPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1182,18 +1099,14 @@ func (this ActivityStreamsTargetPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1586,48 +1499,6 @@ func (this ActivityStreamsTargetPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsTargetPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsTargetPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsTargetPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsTargetPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsTargetPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsTargetPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsTargetPropertyIterator) IsIRI() bool {
@@ -1647,6 +1518,13 @@ func (this ActivityStreamsTargetPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsTargetPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1682,14 +1560,10 @@ func (this ActivityStreamsTargetPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1708,6 +1582,8 @@ func (this ActivityStreamsTargetPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1750,8 +1626,6 @@ func (this ActivityStreamsTargetPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1762,18 +1636,12 @@ func (this ActivityStreamsTargetPropertyIterator) JSONLDContext() map[string]str
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1835,161 +1703,146 @@ func (this ActivityStreamsTargetPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2030,14 +1883,10 @@ func (this ActivityStreamsTargetPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2056,6 +1905,8 @@ func (this ActivityStreamsTargetPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2098,8 +1949,6 @@ func (this ActivityStreamsTargetPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2110,18 +1959,12 @@ func (this ActivityStreamsTargetPropertyIterator) LessThan(o vocab.ActivityStrea
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2545,48 +2388,6 @@ func (this *ActivityStreamsTargetPropertyIterator) SetActivityStreamsView(v voca
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsTargetPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsTargetPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsTargetPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsTargetPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsTargetPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsTargetPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsTargetPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2607,6 +2408,13 @@ func (this *ActivityStreamsTargetPropertyIterator) SetTootEmoji(v vocab.TootEmoj
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsTargetPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsTargetPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2661,10 +2469,6 @@ func (this *ActivityStreamsTargetPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2673,10 +2477,6 @@ func (this *ActivityStreamsTargetPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2713,6 +2513,10 @@ func (this *ActivityStreamsTargetPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2797,10 +2601,6 @@ func (this *ActivityStreamsTargetPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2821,10 +2621,6 @@ func (this *ActivityStreamsTargetPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2837,14 +2633,6 @@ func (this *ActivityStreamsTargetPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2887,10 +2675,8 @@ func (this *ActivityStreamsTargetPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2900,6 +2686,7 @@ func (this *ActivityStreamsTargetPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2921,18 +2708,14 @@ func (this *ActivityStreamsTargetPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2970,14 +2753,10 @@ func (this ActivityStreamsTargetPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2996,6 +2775,8 @@ func (this ActivityStreamsTargetPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3038,8 +2819,6 @@ func (this ActivityStreamsTargetPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3050,18 +2829,12 @@ func (this ActivityStreamsTargetPropertyIterator) serialize() (interface{}, erro
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3740,73 +3513,6 @@ func (this *ActivityStreamsTargetProperty) AppendActivityStreamsView(v vocab.Act
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "target". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTargetProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "target". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTargetProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "target". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTargetProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsTargetPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "target". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTargetProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsTargetPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "target". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsTargetProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "target". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsTargetProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsTargetPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "target"
 func (this *ActivityStreamsTargetProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsTargetPropertyIterator{
@@ -3840,6 +3546,17 @@ func (this *ActivityStreamsTargetProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "target". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsTargetProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsTargetPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "target". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsTargetProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4814,108 +4531,6 @@ func (this *ActivityStreamsTargetProperty) InsertActivityStreamsView(idx int, v
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "target". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "target". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "target". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "target". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "target". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "target". Existing elements at that index
-// and higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "target".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4967,6 +4582,23 @@ func (this *ActivityStreamsTargetProperty) InsertTootEmoji(idx int, v vocab.Toot
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "target". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsTargetProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsTargetPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "target". Existing elements at that index and higher are
 // shifted back once. Invalidates all iterators.
@@ -5090,210 +4722,190 @@ func (this ActivityStreamsTargetProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6094,90 +5706,6 @@ func (this *ActivityStreamsTargetProperty) PrependActivityStreamsView(v vocab.Ac
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "target". Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsTargetPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "target". Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsTargetPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "target". Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsTargetPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "target". Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsTargetPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "target". Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsTargetPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "target". Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsTargetPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property
 // "target".
 func (this *ActivityStreamsTargetProperty) PrependIRI(v *url.URL) {
@@ -6220,6 +5748,20 @@ func (this *ActivityStreamsTargetProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "target". Invalidates all iterators.
+func (this *ActivityStreamsTargetProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsTargetPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "target". Invalidates all iterators.
 func (this *ActivityStreamsTargetProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6988,83 +6530,6 @@ func (this *ActivityStreamsTargetProperty) SetActivityStreamsView(idx int, v voc
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "target". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsTargetProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "target". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsTargetProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "target". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "target". Panics if the index is out of bounds. Invalidates
-// all iterators.
-func (this *ActivityStreamsTargetProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "target". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsTargetProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "target". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsTargetProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsTargetPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property
 // "target". Panics if the index is out of bounds.
 func (this *ActivityStreamsTargetProperty) SetIRI(idx int, v *url.URL) {
@@ -7102,6 +6567,19 @@ func (this *ActivityStreamsTargetProperty) SetTootEmoji(idx int, v vocab.TootEmo
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "target". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsTargetProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsTargetPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "target". Panics if the index is out of bounds.
 // Invalidates all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_to/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_to/gen_pkg.go
index 02353e9b5..e602b1a7c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_to/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_to/gen_pkg.go
@@ -45,10 +45,6 @@ type privateManager interface {
 	// the "ActivityStreamsBlock" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeBlockActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsBlock, error)
-	// DeserializeBranchForgeFed returns the deserialization method for the
-	// "ForgeFedBranch" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeBranchForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedBranch, error)
 	// DeserializeCollectionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsCollection" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -57,10 +53,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsCollectionPage" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeCollectionPageActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsCollectionPage, error)
-	// DeserializeCommitForgeFed returns the deserialization method for the
-	// "ForgeFedCommit" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeCommitForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedCommit, error)
 	// DeserializeCreateActivityStreams returns the deserialization method for
 	// the "ActivityStreamsCreate" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -96,6 +88,9 @@ type privateManager interface {
 	// the "ActivityStreamsGroup" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeGroupActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsGroup, error)
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeIdentityProofToot returns the deserialization method for the
 	// "TootIdentityProof" non-functional property in the vocabulary "Toot"
 	DeserializeIdentityProofToot() func(map[string]interface{}, map[string]string) (vocab.TootIdentityProof, error)
@@ -189,9 +184,6 @@ type privateManager interface {
 	// the "SchemaPropertyValue" non-functional property in the vocabulary
 	// "Schema"
 	DeserializePropertyValueSchema() func(map[string]interface{}, map[string]string) (vocab.SchemaPropertyValue, error)
-	// DeserializePushForgeFed returns the deserialization method for the
-	// "ForgeFedPush" non-functional property in the vocabulary "ForgeFed"
-	DeserializePushForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedPush, error)
 	// DeserializeQuestionActivityStreams returns the deserialization method
 	// for the "ActivityStreamsQuestion" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -212,10 +204,6 @@ type privateManager interface {
 	// the "ActivityStreamsRemove" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeRemoveActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsRemove, error)
-	// DeserializeRepositoryForgeFed returns the deserialization method for
-	// the "ForgeFedRepository" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeRepositoryForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedRepository, error)
 	// DeserializeServiceActivityStreams returns the deserialization method
 	// for the "ActivityStreamsService" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -228,14 +216,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTentativeReject" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTentativeRejectActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTentativeReject, error)
-	// DeserializeTicketDependencyForgeFed returns the deserialization method
-	// for the "ForgeFedTicketDependency" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTicketDependencyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketDependency, error)
-	// DeserializeTicketForgeFed returns the deserialization method for the
-	// "ForgeFedTicket" non-functional property in the vocabulary
-	// "ForgeFed"
-	DeserializeTicketForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicket, error)
 	// DeserializeTombstoneActivityStreams returns the deserialization method
 	// for the "ActivityStreamsTombstone" non-functional property in the
 	// vocabulary "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_to/gen_property_activitystreams_to.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_to/gen_property_activitystreams_to.go
index 706ead07d..c5bfa27e2 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_to/gen_property_activitystreams_to.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_to/gen_property_activitystreams_to.go
@@ -25,10 +25,8 @@ type ActivityStreamsToPropertyIterator struct {
 	activitystreamsArticleMember               vocab.ActivityStreamsArticle
 	activitystreamsAudioMember                 vocab.ActivityStreamsAudio
 	activitystreamsBlockMember                 vocab.ActivityStreamsBlock
-	forgefedBranchMember                       vocab.ForgeFedBranch
 	activitystreamsCollectionMember            vocab.ActivityStreamsCollection
 	activitystreamsCollectionPageMember        vocab.ActivityStreamsCollectionPage
-	forgefedCommitMember                       vocab.ForgeFedCommit
 	activitystreamsCreateMember                vocab.ActivityStreamsCreate
 	activitystreamsDeleteMember                vocab.ActivityStreamsDelete
 	activitystreamsDislikeMember               vocab.ActivityStreamsDislike
@@ -38,6 +36,7 @@ type ActivityStreamsToPropertyIterator struct {
 	activitystreamsFlagMember                  vocab.ActivityStreamsFlag
 	activitystreamsFollowMember                vocab.ActivityStreamsFollow
 	activitystreamsGroupMember                 vocab.ActivityStreamsGroup
+	tootHashtagMember                          vocab.TootHashtag
 	tootIdentityProofMember                    vocab.TootIdentityProof
 	activitystreamsIgnoreMember                vocab.ActivityStreamsIgnore
 	activitystreamsImageMember                 vocab.ActivityStreamsImage
@@ -59,18 +58,14 @@ type ActivityStreamsToPropertyIterator struct {
 	activitystreamsPlaceMember                 vocab.ActivityStreamsPlace
 	activitystreamsProfileMember               vocab.ActivityStreamsProfile
 	schemaPropertyValueMember                  vocab.SchemaPropertyValue
-	forgefedPushMember                         vocab.ForgeFedPush
 	activitystreamsQuestionMember              vocab.ActivityStreamsQuestion
 	activitystreamsReadMember                  vocab.ActivityStreamsRead
 	activitystreamsRejectMember                vocab.ActivityStreamsReject
 	activitystreamsRelationshipMember          vocab.ActivityStreamsRelationship
 	activitystreamsRemoveMember                vocab.ActivityStreamsRemove
-	forgefedRepositoryMember                   vocab.ForgeFedRepository
 	activitystreamsServiceMember               vocab.ActivityStreamsService
 	activitystreamsTentativeAcceptMember       vocab.ActivityStreamsTentativeAccept
 	activitystreamsTentativeRejectMember       vocab.ActivityStreamsTentativeReject
-	forgefedTicketMember                       vocab.ForgeFedTicket
-	forgefedTicketDependencyMember             vocab.ForgeFedTicketDependency
 	activitystreamsTombstoneMember             vocab.ActivityStreamsTombstone
 	activitystreamsTravelMember                vocab.ActivityStreamsTravel
 	activitystreamsUndoMember                  vocab.ActivityStreamsUndo
@@ -175,12 +170,6 @@ func deserializeActivityStreamsToPropertyIterator(i interface{}, aliasMap map[st
 				alias:                      alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeBranchForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsToPropertyIterator{
-				alias:                alias,
-				forgefedBranchMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCollectionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsToPropertyIterator{
 				activitystreamsCollectionMember: v,
@@ -193,12 +182,6 @@ func deserializeActivityStreamsToPropertyIterator(i interface{}, aliasMap map[st
 				alias:                               alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeCommitForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsToPropertyIterator{
-				alias:                alias,
-				forgefedCommitMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeCreateActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsToPropertyIterator{
 				activitystreamsCreateMember: v,
@@ -253,6 +236,12 @@ func deserializeActivityStreamsToPropertyIterator(i interface{}, aliasMap map[st
 				alias:                      alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsToPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeIdentityProofToot()(m, aliasMap); err == nil {
 			this := &ActivityStreamsToPropertyIterator{
 				alias:                   alias,
@@ -379,12 +368,6 @@ func deserializeActivityStreamsToPropertyIterator(i interface{}, aliasMap map[st
 				schemaPropertyValueMember: v,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializePushForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsToPropertyIterator{
-				alias:              alias,
-				forgefedPushMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeQuestionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsToPropertyIterator{
 				activitystreamsQuestionMember: v,
@@ -415,12 +398,6 @@ func deserializeActivityStreamsToPropertyIterator(i interface{}, aliasMap map[st
 				alias:                       alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeRepositoryForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsToPropertyIterator{
-				alias:                    alias,
-				forgefedRepositoryMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeServiceActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsToPropertyIterator{
 				activitystreamsServiceMember: v,
@@ -439,18 +416,6 @@ func deserializeActivityStreamsToPropertyIterator(i interface{}, aliasMap map[st
 				alias:                                alias,
 			}
 			return this, nil
-		} else if v, err := mgr.DeserializeTicketForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsToPropertyIterator{
-				alias:                alias,
-				forgefedTicketMember: v,
-			}
-			return this, nil
-		} else if v, err := mgr.DeserializeTicketDependencyForgeFed()(m, aliasMap); err == nil {
-			this := &ActivityStreamsToPropertyIterator{
-				alias:                          alias,
-				forgefedTicketDependencyMember: v,
-			}
-			return this, nil
 		} else if v, err := mgr.DeserializeTombstoneActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsToPropertyIterator{
 				activitystreamsTombstoneMember: v,
@@ -874,44 +839,6 @@ func (this ActivityStreamsToPropertyIterator) GetActivityStreamsView() vocab.Act
 	return this.activitystreamsViewMember
 }
 
-// GetForgeFedBranch returns the value of this property. When IsForgeFedBranch
-// returns false, GetForgeFedBranch will return an arbitrary value.
-func (this ActivityStreamsToPropertyIterator) GetForgeFedBranch() vocab.ForgeFedBranch {
-	return this.forgefedBranchMember
-}
-
-// GetForgeFedCommit returns the value of this property. When IsForgeFedCommit
-// returns false, GetForgeFedCommit will return an arbitrary value.
-func (this ActivityStreamsToPropertyIterator) GetForgeFedCommit() vocab.ForgeFedCommit {
-	return this.forgefedCommitMember
-}
-
-// GetForgeFedPush returns the value of this property. When IsForgeFedPush returns
-// false, GetForgeFedPush will return an arbitrary value.
-func (this ActivityStreamsToPropertyIterator) GetForgeFedPush() vocab.ForgeFedPush {
-	return this.forgefedPushMember
-}
-
-// GetForgeFedRepository returns the value of this property. When
-// IsForgeFedRepository returns false, GetForgeFedRepository will return an
-// arbitrary value.
-func (this ActivityStreamsToPropertyIterator) GetForgeFedRepository() vocab.ForgeFedRepository {
-	return this.forgefedRepositoryMember
-}
-
-// GetForgeFedTicket returns the value of this property. When IsForgeFedTicket
-// returns false, GetForgeFedTicket will return an arbitrary value.
-func (this ActivityStreamsToPropertyIterator) GetForgeFedTicket() vocab.ForgeFedTicket {
-	return this.forgefedTicketMember
-}
-
-// GetForgeFedTicketDependency returns the value of this property. When
-// IsForgeFedTicketDependency returns false, GetForgeFedTicketDependency will
-// return an arbitrary value.
-func (this ActivityStreamsToPropertyIterator) GetForgeFedTicketDependency() vocab.ForgeFedTicketDependency {
-	return this.forgefedTicketDependencyMember
-}
-
 // GetIRI returns the IRI of this property. When IsIRI returns false, GetIRI will
 // return an arbitrary value.
 func (this ActivityStreamsToPropertyIterator) GetIRI() *url.URL {
@@ -931,6 +858,12 @@ func (this ActivityStreamsToPropertyIterator) GetTootEmoji() vocab.TootEmoji {
 	return this.tootEmojiMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsToPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetTootIdentityProof returns the value of this property. When
 // IsTootIdentityProof returns false, GetTootIdentityProof will return an
 // arbitrary value.
@@ -974,18 +907,12 @@ func (this ActivityStreamsToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock()
 	}
-	if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch()
-	}
 	if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection()
 	}
 	if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage()
 	}
-	if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit()
-	}
 	if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate()
 	}
@@ -1013,6 +940,9 @@ func (this ActivityStreamsToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof()
 	}
@@ -1076,9 +1006,6 @@ func (this ActivityStreamsToPropertyIterator) GetType() vocab.Type {
 	if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue()
 	}
-	if this.IsForgeFedPush() {
-		return this.GetForgeFedPush()
-	}
 	if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion()
 	}
@@ -1094,9 +1021,6 @@ func (this ActivityStreamsToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove()
 	}
-	if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository()
-	}
 	if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService()
 	}
@@ -1106,12 +1030,6 @@ func (this ActivityStreamsToPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject()
 	}
-	if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket()
-	}
-	if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency()
-	}
 	if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone()
 	}
@@ -1147,10 +1065,8 @@ func (this ActivityStreamsToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsArticle() ||
 		this.IsActivityStreamsAudio() ||
 		this.IsActivityStreamsBlock() ||
-		this.IsForgeFedBranch() ||
 		this.IsActivityStreamsCollection() ||
 		this.IsActivityStreamsCollectionPage() ||
-		this.IsForgeFedCommit() ||
 		this.IsActivityStreamsCreate() ||
 		this.IsActivityStreamsDelete() ||
 		this.IsActivityStreamsDislike() ||
@@ -1160,6 +1076,7 @@ func (this ActivityStreamsToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsFlag() ||
 		this.IsActivityStreamsFollow() ||
 		this.IsActivityStreamsGroup() ||
+		this.IsTootHashtag() ||
 		this.IsTootIdentityProof() ||
 		this.IsActivityStreamsIgnore() ||
 		this.IsActivityStreamsImage() ||
@@ -1181,18 +1098,14 @@ func (this ActivityStreamsToPropertyIterator) HasAny() bool {
 		this.IsActivityStreamsPlace() ||
 		this.IsActivityStreamsProfile() ||
 		this.IsSchemaPropertyValue() ||
-		this.IsForgeFedPush() ||
 		this.IsActivityStreamsQuestion() ||
 		this.IsActivityStreamsRead() ||
 		this.IsActivityStreamsReject() ||
 		this.IsActivityStreamsRelationship() ||
 		this.IsActivityStreamsRemove() ||
-		this.IsForgeFedRepository() ||
 		this.IsActivityStreamsService() ||
 		this.IsActivityStreamsTentativeAccept() ||
 		this.IsActivityStreamsTentativeReject() ||
-		this.IsForgeFedTicket() ||
-		this.IsForgeFedTicketDependency() ||
 		this.IsActivityStreamsTombstone() ||
 		this.IsActivityStreamsTravel() ||
 		this.IsActivityStreamsUndo() ||
@@ -1585,48 +1498,6 @@ func (this ActivityStreamsToPropertyIterator) IsActivityStreamsView() bool {
 	return this.activitystreamsViewMember != nil
 }
 
-// IsForgeFedBranch returns true if this property has a type of "Branch". When
-// true, use the GetForgeFedBranch and SetForgeFedBranch methods to access and
-// set this property.
-func (this ActivityStreamsToPropertyIterator) IsForgeFedBranch() bool {
-	return this.forgefedBranchMember != nil
-}
-
-// IsForgeFedCommit returns true if this property has a type of "Commit". When
-// true, use the GetForgeFedCommit and SetForgeFedCommit methods to access and
-// set this property.
-func (this ActivityStreamsToPropertyIterator) IsForgeFedCommit() bool {
-	return this.forgefedCommitMember != nil
-}
-
-// IsForgeFedPush returns true if this property has a type of "Push". When true,
-// use the GetForgeFedPush and SetForgeFedPush methods to access and set this
-// property.
-func (this ActivityStreamsToPropertyIterator) IsForgeFedPush() bool {
-	return this.forgefedPushMember != nil
-}
-
-// IsForgeFedRepository returns true if this property has a type of "Repository".
-// When true, use the GetForgeFedRepository and SetForgeFedRepository methods
-// to access and set this property.
-func (this ActivityStreamsToPropertyIterator) IsForgeFedRepository() bool {
-	return this.forgefedRepositoryMember != nil
-}
-
-// IsForgeFedTicket returns true if this property has a type of "Ticket". When
-// true, use the GetForgeFedTicket and SetForgeFedTicket methods to access and
-// set this property.
-func (this ActivityStreamsToPropertyIterator) IsForgeFedTicket() bool {
-	return this.forgefedTicketMember != nil
-}
-
-// IsForgeFedTicketDependency returns true if this property has a type of
-// "TicketDependency". When true, use the GetForgeFedTicketDependency and
-// SetForgeFedTicketDependency methods to access and set this property.
-func (this ActivityStreamsToPropertyIterator) IsForgeFedTicketDependency() bool {
-	return this.forgefedTicketDependencyMember != nil
-}
-
 // IsIRI returns true if this property is an IRI. When true, use GetIRI and SetIRI
 // to access and set this property
 func (this ActivityStreamsToPropertyIterator) IsIRI() bool {
@@ -1646,6 +1517,13 @@ func (this ActivityStreamsToPropertyIterator) IsTootEmoji() bool {
 	return this.tootEmojiMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsToPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsTootIdentityProof returns true if this property has a type of
 // "IdentityProof". When true, use the GetTootIdentityProof and
 // SetTootIdentityProof methods to access and set this property.
@@ -1681,14 +1559,10 @@ func (this ActivityStreamsToPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsAudio().JSONLDContext()
 	} else if this.IsActivityStreamsBlock() {
 		child = this.GetActivityStreamsBlock().JSONLDContext()
-	} else if this.IsForgeFedBranch() {
-		child = this.GetForgeFedBranch().JSONLDContext()
 	} else if this.IsActivityStreamsCollection() {
 		child = this.GetActivityStreamsCollection().JSONLDContext()
 	} else if this.IsActivityStreamsCollectionPage() {
 		child = this.GetActivityStreamsCollectionPage().JSONLDContext()
-	} else if this.IsForgeFedCommit() {
-		child = this.GetForgeFedCommit().JSONLDContext()
 	} else if this.IsActivityStreamsCreate() {
 		child = this.GetActivityStreamsCreate().JSONLDContext()
 	} else if this.IsActivityStreamsDelete() {
@@ -1707,6 +1581,8 @@ func (this ActivityStreamsToPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsFollow().JSONLDContext()
 	} else if this.IsActivityStreamsGroup() {
 		child = this.GetActivityStreamsGroup().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsTootIdentityProof() {
 		child = this.GetTootIdentityProof().JSONLDContext()
 	} else if this.IsActivityStreamsIgnore() {
@@ -1749,8 +1625,6 @@ func (this ActivityStreamsToPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsProfile().JSONLDContext()
 	} else if this.IsSchemaPropertyValue() {
 		child = this.GetSchemaPropertyValue().JSONLDContext()
-	} else if this.IsForgeFedPush() {
-		child = this.GetForgeFedPush().JSONLDContext()
 	} else if this.IsActivityStreamsQuestion() {
 		child = this.GetActivityStreamsQuestion().JSONLDContext()
 	} else if this.IsActivityStreamsRead() {
@@ -1761,18 +1635,12 @@ func (this ActivityStreamsToPropertyIterator) JSONLDContext() map[string]string
 		child = this.GetActivityStreamsRelationship().JSONLDContext()
 	} else if this.IsActivityStreamsRemove() {
 		child = this.GetActivityStreamsRemove().JSONLDContext()
-	} else if this.IsForgeFedRepository() {
-		child = this.GetForgeFedRepository().JSONLDContext()
 	} else if this.IsActivityStreamsService() {
 		child = this.GetActivityStreamsService().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		child = this.GetActivityStreamsTentativeAccept().JSONLDContext()
 	} else if this.IsActivityStreamsTentativeReject() {
 		child = this.GetActivityStreamsTentativeReject().JSONLDContext()
-	} else if this.IsForgeFedTicket() {
-		child = this.GetForgeFedTicket().JSONLDContext()
-	} else if this.IsForgeFedTicketDependency() {
-		child = this.GetForgeFedTicketDependency().JSONLDContext()
 	} else if this.IsActivityStreamsTombstone() {
 		child = this.GetActivityStreamsTombstone().JSONLDContext()
 	} else if this.IsActivityStreamsTravel() {
@@ -1834,161 +1702,146 @@ func (this ActivityStreamsToPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsBlock() {
 		return 10
 	}
-	if this.IsForgeFedBranch() {
+	if this.IsActivityStreamsCollection() {
 		return 11
 	}
-	if this.IsActivityStreamsCollection() {
+	if this.IsActivityStreamsCollectionPage() {
 		return 12
 	}
-	if this.IsActivityStreamsCollectionPage() {
+	if this.IsActivityStreamsCreate() {
 		return 13
 	}
-	if this.IsForgeFedCommit() {
+	if this.IsActivityStreamsDelete() {
 		return 14
 	}
-	if this.IsActivityStreamsCreate() {
+	if this.IsActivityStreamsDislike() {
 		return 15
 	}
-	if this.IsActivityStreamsDelete() {
+	if this.IsActivityStreamsDocument() {
 		return 16
 	}
-	if this.IsActivityStreamsDislike() {
+	if this.IsTootEmoji() {
 		return 17
 	}
-	if this.IsActivityStreamsDocument() {
+	if this.IsActivityStreamsEvent() {
 		return 18
 	}
-	if this.IsTootEmoji() {
+	if this.IsActivityStreamsFlag() {
 		return 19
 	}
-	if this.IsActivityStreamsEvent() {
+	if this.IsActivityStreamsFollow() {
 		return 20
 	}
-	if this.IsActivityStreamsFlag() {
+	if this.IsActivityStreamsGroup() {
 		return 21
 	}
-	if this.IsActivityStreamsFollow() {
+	if this.IsTootHashtag() {
 		return 22
 	}
-	if this.IsActivityStreamsGroup() {
-		return 23
-	}
 	if this.IsTootIdentityProof() {
-		return 24
+		return 23
 	}
 	if this.IsActivityStreamsIgnore() {
-		return 25
+		return 24
 	}
 	if this.IsActivityStreamsImage() {
-		return 26
+		return 25
 	}
 	if this.IsActivityStreamsIntransitiveActivity() {
-		return 27
+		return 26
 	}
 	if this.IsActivityStreamsInvite() {
-		return 28
+		return 27
 	}
 	if this.IsActivityStreamsJoin() {
-		return 29
+		return 28
 	}
 	if this.IsActivityStreamsLeave() {
-		return 30
+		return 29
 	}
 	if this.IsActivityStreamsLike() {
-		return 31
+		return 30
 	}
 	if this.IsActivityStreamsListen() {
-		return 32
+		return 31
 	}
 	if this.IsActivityStreamsMention() {
-		return 33
+		return 32
 	}
 	if this.IsActivityStreamsMove() {
-		return 34
+		return 33
 	}
 	if this.IsActivityStreamsNote() {
-		return 35
+		return 34
 	}
 	if this.IsActivityStreamsOffer() {
-		return 36
+		return 35
 	}
 	if this.IsActivityStreamsOrderedCollection() {
-		return 37
+		return 36
 	}
 	if this.IsActivityStreamsOrderedCollectionPage() {
-		return 38
+		return 37
 	}
 	if this.IsActivityStreamsOrganization() {
-		return 39
+		return 38
 	}
 	if this.IsActivityStreamsPage() {
-		return 40
+		return 39
 	}
 	if this.IsActivityStreamsPerson() {
-		return 41
+		return 40
 	}
 	if this.IsActivityStreamsPlace() {
-		return 42
+		return 41
 	}
 	if this.IsActivityStreamsProfile() {
-		return 43
+		return 42
 	}
 	if this.IsSchemaPropertyValue() {
-		return 44
-	}
-	if this.IsForgeFedPush() {
-		return 45
+		return 43
 	}
 	if this.IsActivityStreamsQuestion() {
-		return 46
+		return 44
 	}
 	if this.IsActivityStreamsRead() {
-		return 47
+		return 45
 	}
 	if this.IsActivityStreamsReject() {
-		return 48
+		return 46
 	}
 	if this.IsActivityStreamsRelationship() {
-		return 49
+		return 47
 	}
 	if this.IsActivityStreamsRemove() {
-		return 50
-	}
-	if this.IsForgeFedRepository() {
-		return 51
+		return 48
 	}
 	if this.IsActivityStreamsService() {
-		return 52
+		return 49
 	}
 	if this.IsActivityStreamsTentativeAccept() {
-		return 53
+		return 50
 	}
 	if this.IsActivityStreamsTentativeReject() {
-		return 54
-	}
-	if this.IsForgeFedTicket() {
-		return 55
-	}
-	if this.IsForgeFedTicketDependency() {
-		return 56
+		return 51
 	}
 	if this.IsActivityStreamsTombstone() {
-		return 57
+		return 52
 	}
 	if this.IsActivityStreamsTravel() {
-		return 58
+		return 53
 	}
 	if this.IsActivityStreamsUndo() {
-		return 59
+		return 54
 	}
 	if this.IsActivityStreamsUpdate() {
-		return 60
+		return 55
 	}
 	if this.IsActivityStreamsVideo() {
-		return 61
+		return 56
 	}
 	if this.IsActivityStreamsView() {
-		return 62
+		return 57
 	}
 	if this.IsIRI() {
 		return -2
@@ -2029,14 +1882,10 @@ func (this ActivityStreamsToPropertyIterator) LessThan(o vocab.ActivityStreamsTo
 		return this.GetActivityStreamsAudio().LessThan(o.GetActivityStreamsAudio())
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().LessThan(o.GetActivityStreamsBlock())
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().LessThan(o.GetForgeFedBranch())
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().LessThan(o.GetActivityStreamsCollection())
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().LessThan(o.GetActivityStreamsCollectionPage())
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().LessThan(o.GetForgeFedCommit())
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().LessThan(o.GetActivityStreamsCreate())
 	} else if this.IsActivityStreamsDelete() {
@@ -2055,6 +1904,8 @@ func (this ActivityStreamsToPropertyIterator) LessThan(o vocab.ActivityStreamsTo
 		return this.GetActivityStreamsFollow().LessThan(o.GetActivityStreamsFollow())
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().LessThan(o.GetActivityStreamsGroup())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().LessThan(o.GetTootIdentityProof())
 	} else if this.IsActivityStreamsIgnore() {
@@ -2097,8 +1948,6 @@ func (this ActivityStreamsToPropertyIterator) LessThan(o vocab.ActivityStreamsTo
 		return this.GetActivityStreamsProfile().LessThan(o.GetActivityStreamsProfile())
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().LessThan(o.GetSchemaPropertyValue())
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().LessThan(o.GetForgeFedPush())
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().LessThan(o.GetActivityStreamsQuestion())
 	} else if this.IsActivityStreamsRead() {
@@ -2109,18 +1958,12 @@ func (this ActivityStreamsToPropertyIterator) LessThan(o vocab.ActivityStreamsTo
 		return this.GetActivityStreamsRelationship().LessThan(o.GetActivityStreamsRelationship())
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().LessThan(o.GetActivityStreamsRemove())
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().LessThan(o.GetForgeFedRepository())
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().LessThan(o.GetActivityStreamsService())
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().LessThan(o.GetActivityStreamsTentativeAccept())
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().LessThan(o.GetActivityStreamsTentativeReject())
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().LessThan(o.GetForgeFedTicket())
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().LessThan(o.GetForgeFedTicketDependency())
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().LessThan(o.GetActivityStreamsTombstone())
 	} else if this.IsActivityStreamsTravel() {
@@ -2544,48 +2387,6 @@ func (this *ActivityStreamsToPropertyIterator) SetActivityStreamsView(v vocab.Ac
 	this.activitystreamsViewMember = v
 }
 
-// SetForgeFedBranch sets the value of this property. Calling IsForgeFedBranch
-// afterwards returns true.
-func (this *ActivityStreamsToPropertyIterator) SetForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.clear()
-	this.forgefedBranchMember = v
-}
-
-// SetForgeFedCommit sets the value of this property. Calling IsForgeFedCommit
-// afterwards returns true.
-func (this *ActivityStreamsToPropertyIterator) SetForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.clear()
-	this.forgefedCommitMember = v
-}
-
-// SetForgeFedPush sets the value of this property. Calling IsForgeFedPush
-// afterwards returns true.
-func (this *ActivityStreamsToPropertyIterator) SetForgeFedPush(v vocab.ForgeFedPush) {
-	this.clear()
-	this.forgefedPushMember = v
-}
-
-// SetForgeFedRepository sets the value of this property. Calling
-// IsForgeFedRepository afterwards returns true.
-func (this *ActivityStreamsToPropertyIterator) SetForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.clear()
-	this.forgefedRepositoryMember = v
-}
-
-// SetForgeFedTicket sets the value of this property. Calling IsForgeFedTicket
-// afterwards returns true.
-func (this *ActivityStreamsToPropertyIterator) SetForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.clear()
-	this.forgefedTicketMember = v
-}
-
-// SetForgeFedTicketDependency sets the value of this property. Calling
-// IsForgeFedTicketDependency afterwards returns true.
-func (this *ActivityStreamsToPropertyIterator) SetForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.clear()
-	this.forgefedTicketDependencyMember = v
-}
-
 // SetIRI sets the value of this property. Calling IsIRI afterwards returns true.
 func (this *ActivityStreamsToPropertyIterator) SetIRI(v *url.URL) {
 	this.clear()
@@ -2606,6 +2407,13 @@ func (this *ActivityStreamsToPropertyIterator) SetTootEmoji(v vocab.TootEmoji) {
 	this.tootEmojiMember = v
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsToPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetTootIdentityProof sets the value of this property. Calling
 // IsTootIdentityProof afterwards returns true.
 func (this *ActivityStreamsToPropertyIterator) SetTootIdentityProof(v vocab.TootIdentityProof) {
@@ -2660,10 +2468,6 @@ func (this *ActivityStreamsToPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsBlock(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedBranch); ok {
-		this.SetForgeFedBranch(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCollection); ok {
 		this.SetActivityStreamsCollection(v)
 		return nil
@@ -2672,10 +2476,6 @@ func (this *ActivityStreamsToPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsCollectionPage(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedCommit); ok {
-		this.SetForgeFedCommit(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsCreate); ok {
 		this.SetActivityStreamsCreate(v)
 		return nil
@@ -2712,6 +2512,10 @@ func (this *ActivityStreamsToPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsGroup(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.TootIdentityProof); ok {
 		this.SetTootIdentityProof(v)
 		return nil
@@ -2796,10 +2600,6 @@ func (this *ActivityStreamsToPropertyIterator) SetType(t vocab.Type) error {
 		this.SetSchemaPropertyValue(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedPush); ok {
-		this.SetForgeFedPush(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsQuestion); ok {
 		this.SetActivityStreamsQuestion(v)
 		return nil
@@ -2820,10 +2620,6 @@ func (this *ActivityStreamsToPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsRemove(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedRepository); ok {
-		this.SetForgeFedRepository(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsService); ok {
 		this.SetActivityStreamsService(v)
 		return nil
@@ -2836,14 +2632,6 @@ func (this *ActivityStreamsToPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsTentativeReject(v)
 		return nil
 	}
-	if v, ok := t.(vocab.ForgeFedTicket); ok {
-		this.SetForgeFedTicket(v)
-		return nil
-	}
-	if v, ok := t.(vocab.ForgeFedTicketDependency); ok {
-		this.SetForgeFedTicketDependency(v)
-		return nil
-	}
 	if v, ok := t.(vocab.ActivityStreamsTombstone); ok {
 		this.SetActivityStreamsTombstone(v)
 		return nil
@@ -2886,10 +2674,8 @@ func (this *ActivityStreamsToPropertyIterator) clear() {
 	this.activitystreamsArticleMember = nil
 	this.activitystreamsAudioMember = nil
 	this.activitystreamsBlockMember = nil
-	this.forgefedBranchMember = nil
 	this.activitystreamsCollectionMember = nil
 	this.activitystreamsCollectionPageMember = nil
-	this.forgefedCommitMember = nil
 	this.activitystreamsCreateMember = nil
 	this.activitystreamsDeleteMember = nil
 	this.activitystreamsDislikeMember = nil
@@ -2899,6 +2685,7 @@ func (this *ActivityStreamsToPropertyIterator) clear() {
 	this.activitystreamsFlagMember = nil
 	this.activitystreamsFollowMember = nil
 	this.activitystreamsGroupMember = nil
+	this.tootHashtagMember = nil
 	this.tootIdentityProofMember = nil
 	this.activitystreamsIgnoreMember = nil
 	this.activitystreamsImageMember = nil
@@ -2920,18 +2707,14 @@ func (this *ActivityStreamsToPropertyIterator) clear() {
 	this.activitystreamsPlaceMember = nil
 	this.activitystreamsProfileMember = nil
 	this.schemaPropertyValueMember = nil
-	this.forgefedPushMember = nil
 	this.activitystreamsQuestionMember = nil
 	this.activitystreamsReadMember = nil
 	this.activitystreamsRejectMember = nil
 	this.activitystreamsRelationshipMember = nil
 	this.activitystreamsRemoveMember = nil
-	this.forgefedRepositoryMember = nil
 	this.activitystreamsServiceMember = nil
 	this.activitystreamsTentativeAcceptMember = nil
 	this.activitystreamsTentativeRejectMember = nil
-	this.forgefedTicketMember = nil
-	this.forgefedTicketDependencyMember = nil
 	this.activitystreamsTombstoneMember = nil
 	this.activitystreamsTravelMember = nil
 	this.activitystreamsUndoMember = nil
@@ -2969,14 +2752,10 @@ func (this ActivityStreamsToPropertyIterator) serialize() (interface{}, error) {
 		return this.GetActivityStreamsAudio().Serialize()
 	} else if this.IsActivityStreamsBlock() {
 		return this.GetActivityStreamsBlock().Serialize()
-	} else if this.IsForgeFedBranch() {
-		return this.GetForgeFedBranch().Serialize()
 	} else if this.IsActivityStreamsCollection() {
 		return this.GetActivityStreamsCollection().Serialize()
 	} else if this.IsActivityStreamsCollectionPage() {
 		return this.GetActivityStreamsCollectionPage().Serialize()
-	} else if this.IsForgeFedCommit() {
-		return this.GetForgeFedCommit().Serialize()
 	} else if this.IsActivityStreamsCreate() {
 		return this.GetActivityStreamsCreate().Serialize()
 	} else if this.IsActivityStreamsDelete() {
@@ -2995,6 +2774,8 @@ func (this ActivityStreamsToPropertyIterator) serialize() (interface{}, error) {
 		return this.GetActivityStreamsFollow().Serialize()
 	} else if this.IsActivityStreamsGroup() {
 		return this.GetActivityStreamsGroup().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsTootIdentityProof() {
 		return this.GetTootIdentityProof().Serialize()
 	} else if this.IsActivityStreamsIgnore() {
@@ -3037,8 +2818,6 @@ func (this ActivityStreamsToPropertyIterator) serialize() (interface{}, error) {
 		return this.GetActivityStreamsProfile().Serialize()
 	} else if this.IsSchemaPropertyValue() {
 		return this.GetSchemaPropertyValue().Serialize()
-	} else if this.IsForgeFedPush() {
-		return this.GetForgeFedPush().Serialize()
 	} else if this.IsActivityStreamsQuestion() {
 		return this.GetActivityStreamsQuestion().Serialize()
 	} else if this.IsActivityStreamsRead() {
@@ -3049,18 +2828,12 @@ func (this ActivityStreamsToPropertyIterator) serialize() (interface{}, error) {
 		return this.GetActivityStreamsRelationship().Serialize()
 	} else if this.IsActivityStreamsRemove() {
 		return this.GetActivityStreamsRemove().Serialize()
-	} else if this.IsForgeFedRepository() {
-		return this.GetForgeFedRepository().Serialize()
 	} else if this.IsActivityStreamsService() {
 		return this.GetActivityStreamsService().Serialize()
 	} else if this.IsActivityStreamsTentativeAccept() {
 		return this.GetActivityStreamsTentativeAccept().Serialize()
 	} else if this.IsActivityStreamsTentativeReject() {
 		return this.GetActivityStreamsTentativeReject().Serialize()
-	} else if this.IsForgeFedTicket() {
-		return this.GetForgeFedTicket().Serialize()
-	} else if this.IsForgeFedTicketDependency() {
-		return this.GetForgeFedTicketDependency().Serialize()
 	} else if this.IsActivityStreamsTombstone() {
 		return this.GetActivityStreamsTombstone().Serialize()
 	} else if this.IsActivityStreamsTravel() {
@@ -3738,73 +3511,6 @@ func (this *ActivityStreamsToProperty) AppendActivityStreamsView(v vocab.Activit
 	})
 }
 
-// AppendForgeFedBranch appends a Branch value to the back of a list of the
-// property "to". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsToProperty) AppendForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedCommit appends a Commit value to the back of a list of the
-// property "to". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsToProperty) AppendForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedPush appends a Push value to the back of a list of the property
-// "to". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsToProperty) AppendForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, &ActivityStreamsToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              this.Len(),
-		parent:             this,
-	})
-}
-
-// AppendForgeFedRepository appends a Repository value to the back of a list of
-// the property "to". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsToProperty) AppendForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, &ActivityStreamsToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    this.Len(),
-		parent:                   this,
-	})
-}
-
-// AppendForgeFedTicket appends a Ticket value to the back of a list of the
-// property "to". Invalidates iterators that are traversing using Prev.
-func (this *ActivityStreamsToProperty) AppendForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                this.Len(),
-		parent:               this,
-	})
-}
-
-// AppendForgeFedTicketDependency appends a TicketDependency value to the back of
-// a list of the property "to". Invalidates iterators that are traversing
-// using Prev.
-func (this *ActivityStreamsToProperty) AppendForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, &ActivityStreamsToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          this.Len(),
-		parent:                         this,
-	})
-}
-
 // AppendIRI appends an IRI value to the back of a list of the property "to"
 func (this *ActivityStreamsToProperty) AppendIRI(v *url.URL) {
 	this.properties = append(this.properties, &ActivityStreamsToPropertyIterator{
@@ -3837,6 +3543,17 @@ func (this *ActivityStreamsToProperty) AppendTootEmoji(v vocab.TootEmoji) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "to". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsToProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // AppendTootIdentityProof appends a IdentityProof value to the back of a list of
 // the property "to". Invalidates iterators that are traversing using Prev.
 func (this *ActivityStreamsToProperty) AppendTootIdentityProof(v vocab.TootIdentityProof) {
@@ -4811,108 +4528,6 @@ func (this *ActivityStreamsToProperty) InsertActivityStreamsView(idx int, v voca
 	}
 }
 
-// InsertForgeFedBranch inserts a Branch value at the specified index for a
-// property "to". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsToProperty) InsertForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedCommit inserts a Commit value at the specified index for a
-// property "to". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsToProperty) InsertForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedPush inserts a Push value at the specified index for a property
-// "to". Existing elements at that index and higher are shifted back once.
-// Invalidates all iterators.
-func (this *ActivityStreamsToProperty) InsertForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedRepository inserts a Repository value at the specified index for
-// a property "to". Existing elements at that index and higher are shifted
-// back once. Invalidates all iterators.
-func (this *ActivityStreamsToProperty) InsertForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicket inserts a Ticket value at the specified index for a
-// property "to". Existing elements at that index and higher are shifted back
-// once. Invalidates all iterators.
-func (this *ActivityStreamsToProperty) InsertForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// InsertForgeFedTicketDependency inserts a TicketDependency value at the
-// specified index for a property "to". Existing elements at that index and
-// higher are shifted back once. Invalidates all iterators.
-func (this *ActivityStreamsToProperty) InsertForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	this.properties = append(this.properties, nil)
-	copy(this.properties[idx+1:], this.properties[idx:])
-	this.properties[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-	for i := idx; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // Insert inserts an IRI value at the specified index for a property "to".
 // Existing elements at that index and higher are shifted back once.
 // Invalidates all iterators.
@@ -4964,6 +4579,23 @@ func (this *ActivityStreamsToProperty) InsertTootEmoji(idx int, v vocab.TootEmoj
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "to". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsToProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // InsertTootIdentityProof inserts a IdentityProof value at the specified index
 // for a property "to". Existing elements at that index and higher are shifted
 // back once. Invalidates all iterators.
@@ -5087,210 +4719,190 @@ func (this ActivityStreamsToProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsBlock()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 11 {
-			lhs := this.properties[i].GetForgeFedBranch()
-			rhs := this.properties[j].GetForgeFedBranch()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollection()
 			rhs := this.properties[j].GetActivityStreamsCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 13 {
+		} else if idx1 == 12 {
 			lhs := this.properties[i].GetActivityStreamsCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 14 {
-			lhs := this.properties[i].GetForgeFedCommit()
-			rhs := this.properties[j].GetForgeFedCommit()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 15 {
+		} else if idx1 == 13 {
 			lhs := this.properties[i].GetActivityStreamsCreate()
 			rhs := this.properties[j].GetActivityStreamsCreate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 16 {
+		} else if idx1 == 14 {
 			lhs := this.properties[i].GetActivityStreamsDelete()
 			rhs := this.properties[j].GetActivityStreamsDelete()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 17 {
+		} else if idx1 == 15 {
 			lhs := this.properties[i].GetActivityStreamsDislike()
 			rhs := this.properties[j].GetActivityStreamsDislike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 18 {
+		} else if idx1 == 16 {
 			lhs := this.properties[i].GetActivityStreamsDocument()
 			rhs := this.properties[j].GetActivityStreamsDocument()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 19 {
+		} else if idx1 == 17 {
 			lhs := this.properties[i].GetTootEmoji()
 			rhs := this.properties[j].GetTootEmoji()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 20 {
+		} else if idx1 == 18 {
 			lhs := this.properties[i].GetActivityStreamsEvent()
 			rhs := this.properties[j].GetActivityStreamsEvent()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 21 {
+		} else if idx1 == 19 {
 			lhs := this.properties[i].GetActivityStreamsFlag()
 			rhs := this.properties[j].GetActivityStreamsFlag()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 22 {
+		} else if idx1 == 20 {
 			lhs := this.properties[i].GetActivityStreamsFollow()
 			rhs := this.properties[j].GetActivityStreamsFollow()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 23 {
+		} else if idx1 == 21 {
 			lhs := this.properties[i].GetActivityStreamsGroup()
 			rhs := this.properties[j].GetActivityStreamsGroup()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 24 {
+		} else if idx1 == 22 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 23 {
 			lhs := this.properties[i].GetTootIdentityProof()
 			rhs := this.properties[j].GetTootIdentityProof()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 25 {
+		} else if idx1 == 24 {
 			lhs := this.properties[i].GetActivityStreamsIgnore()
 			rhs := this.properties[j].GetActivityStreamsIgnore()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 26 {
+		} else if idx1 == 25 {
 			lhs := this.properties[i].GetActivityStreamsImage()
 			rhs := this.properties[j].GetActivityStreamsImage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 27 {
+		} else if idx1 == 26 {
 			lhs := this.properties[i].GetActivityStreamsIntransitiveActivity()
 			rhs := this.properties[j].GetActivityStreamsIntransitiveActivity()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 28 {
+		} else if idx1 == 27 {
 			lhs := this.properties[i].GetActivityStreamsInvite()
 			rhs := this.properties[j].GetActivityStreamsInvite()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 29 {
+		} else if idx1 == 28 {
 			lhs := this.properties[i].GetActivityStreamsJoin()
 			rhs := this.properties[j].GetActivityStreamsJoin()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 30 {
+		} else if idx1 == 29 {
 			lhs := this.properties[i].GetActivityStreamsLeave()
 			rhs := this.properties[j].GetActivityStreamsLeave()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 31 {
+		} else if idx1 == 30 {
 			lhs := this.properties[i].GetActivityStreamsLike()
 			rhs := this.properties[j].GetActivityStreamsLike()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 32 {
+		} else if idx1 == 31 {
 			lhs := this.properties[i].GetActivityStreamsListen()
 			rhs := this.properties[j].GetActivityStreamsListen()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 33 {
+		} else if idx1 == 32 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 34 {
+		} else if idx1 == 33 {
 			lhs := this.properties[i].GetActivityStreamsMove()
 			rhs := this.properties[j].GetActivityStreamsMove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 35 {
+		} else if idx1 == 34 {
 			lhs := this.properties[i].GetActivityStreamsNote()
 			rhs := this.properties[j].GetActivityStreamsNote()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 36 {
+		} else if idx1 == 35 {
 			lhs := this.properties[i].GetActivityStreamsOffer()
 			rhs := this.properties[j].GetActivityStreamsOffer()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 37 {
+		} else if idx1 == 36 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollection()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollection()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 38 {
+		} else if idx1 == 37 {
 			lhs := this.properties[i].GetActivityStreamsOrderedCollectionPage()
 			rhs := this.properties[j].GetActivityStreamsOrderedCollectionPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 39 {
+		} else if idx1 == 38 {
 			lhs := this.properties[i].GetActivityStreamsOrganization()
 			rhs := this.properties[j].GetActivityStreamsOrganization()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 40 {
+		} else if idx1 == 39 {
 			lhs := this.properties[i].GetActivityStreamsPage()
 			rhs := this.properties[j].GetActivityStreamsPage()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 41 {
+		} else if idx1 == 40 {
 			lhs := this.properties[i].GetActivityStreamsPerson()
 			rhs := this.properties[j].GetActivityStreamsPerson()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 42 {
+		} else if idx1 == 41 {
 			lhs := this.properties[i].GetActivityStreamsPlace()
 			rhs := this.properties[j].GetActivityStreamsPlace()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 43 {
+		} else if idx1 == 42 {
 			lhs := this.properties[i].GetActivityStreamsProfile()
 			rhs := this.properties[j].GetActivityStreamsProfile()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 44 {
+		} else if idx1 == 43 {
 			lhs := this.properties[i].GetSchemaPropertyValue()
 			rhs := this.properties[j].GetSchemaPropertyValue()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 45 {
-			lhs := this.properties[i].GetForgeFedPush()
-			rhs := this.properties[j].GetForgeFedPush()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 46 {
+		} else if idx1 == 44 {
 			lhs := this.properties[i].GetActivityStreamsQuestion()
 			rhs := this.properties[j].GetActivityStreamsQuestion()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 47 {
+		} else if idx1 == 45 {
 			lhs := this.properties[i].GetActivityStreamsRead()
 			rhs := this.properties[j].GetActivityStreamsRead()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 48 {
+		} else if idx1 == 46 {
 			lhs := this.properties[i].GetActivityStreamsReject()
 			rhs := this.properties[j].GetActivityStreamsReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 49 {
+		} else if idx1 == 47 {
 			lhs := this.properties[i].GetActivityStreamsRelationship()
 			rhs := this.properties[j].GetActivityStreamsRelationship()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 50 {
+		} else if idx1 == 48 {
 			lhs := this.properties[i].GetActivityStreamsRemove()
 			rhs := this.properties[j].GetActivityStreamsRemove()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 51 {
-			lhs := this.properties[i].GetForgeFedRepository()
-			rhs := this.properties[j].GetForgeFedRepository()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 52 {
+		} else if idx1 == 49 {
 			lhs := this.properties[i].GetActivityStreamsService()
 			rhs := this.properties[j].GetActivityStreamsService()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 53 {
+		} else if idx1 == 50 {
 			lhs := this.properties[i].GetActivityStreamsTentativeAccept()
 			rhs := this.properties[j].GetActivityStreamsTentativeAccept()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 54 {
+		} else if idx1 == 51 {
 			lhs := this.properties[i].GetActivityStreamsTentativeReject()
 			rhs := this.properties[j].GetActivityStreamsTentativeReject()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 55 {
-			lhs := this.properties[i].GetForgeFedTicket()
-			rhs := this.properties[j].GetForgeFedTicket()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 56 {
-			lhs := this.properties[i].GetForgeFedTicketDependency()
-			rhs := this.properties[j].GetForgeFedTicketDependency()
-			return lhs.LessThan(rhs)
-		} else if idx1 == 57 {
+		} else if idx1 == 52 {
 			lhs := this.properties[i].GetActivityStreamsTombstone()
 			rhs := this.properties[j].GetActivityStreamsTombstone()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 58 {
+		} else if idx1 == 53 {
 			lhs := this.properties[i].GetActivityStreamsTravel()
 			rhs := this.properties[j].GetActivityStreamsTravel()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 59 {
+		} else if idx1 == 54 {
 			lhs := this.properties[i].GetActivityStreamsUndo()
 			rhs := this.properties[j].GetActivityStreamsUndo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 60 {
+		} else if idx1 == 55 {
 			lhs := this.properties[i].GetActivityStreamsUpdate()
 			rhs := this.properties[j].GetActivityStreamsUpdate()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 61 {
+		} else if idx1 == 56 {
 			lhs := this.properties[i].GetActivityStreamsVideo()
 			rhs := this.properties[j].GetActivityStreamsVideo()
 			return lhs.LessThan(rhs)
-		} else if idx1 == 62 {
+		} else if idx1 == 57 {
 			lhs := this.properties[i].GetActivityStreamsView()
 			rhs := this.properties[j].GetActivityStreamsView()
 			return lhs.LessThan(rhs)
@@ -6091,90 +5703,6 @@ func (this *ActivityStreamsToProperty) PrependActivityStreamsView(v vocab.Activi
 	}
 }
 
-// PrependForgeFedBranch prepends a Branch value to the front of a list of the
-// property "to". Invalidates all iterators.
-func (this *ActivityStreamsToProperty) PrependForgeFedBranch(v vocab.ForgeFedBranch) {
-	this.properties = append([]*ActivityStreamsToPropertyIterator{{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedCommit prepends a Commit value to the front of a list of the
-// property "to". Invalidates all iterators.
-func (this *ActivityStreamsToProperty) PrependForgeFedCommit(v vocab.ForgeFedCommit) {
-	this.properties = append([]*ActivityStreamsToPropertyIterator{{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedPush prepends a Push value to the front of a list of the
-// property "to". Invalidates all iterators.
-func (this *ActivityStreamsToProperty) PrependForgeFedPush(v vocab.ForgeFedPush) {
-	this.properties = append([]*ActivityStreamsToPropertyIterator{{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              0,
-		parent:             this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedRepository prepends a Repository value to the front of a list of
-// the property "to". Invalidates all iterators.
-func (this *ActivityStreamsToProperty) PrependForgeFedRepository(v vocab.ForgeFedRepository) {
-	this.properties = append([]*ActivityStreamsToPropertyIterator{{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    0,
-		parent:                   this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicket prepends a Ticket value to the front of a list of the
-// property "to". Invalidates all iterators.
-func (this *ActivityStreamsToProperty) PrependForgeFedTicket(v vocab.ForgeFedTicket) {
-	this.properties = append([]*ActivityStreamsToPropertyIterator{{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                0,
-		parent:               this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
-// PrependForgeFedTicketDependency prepends a TicketDependency value to the front
-// of a list of the property "to". Invalidates all iterators.
-func (this *ActivityStreamsToProperty) PrependForgeFedTicketDependency(v vocab.ForgeFedTicketDependency) {
-	this.properties = append([]*ActivityStreamsToPropertyIterator{{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          0,
-		parent:                         this,
-	}}, this.properties...)
-	for i := 1; i < this.Len(); i++ {
-		(this.properties)[i].myIdx = i
-	}
-}
-
 // PrependIRI prepends an IRI value to the front of a list of the property "to".
 func (this *ActivityStreamsToProperty) PrependIRI(v *url.URL) {
 	this.properties = append([]*ActivityStreamsToPropertyIterator{{
@@ -6216,6 +5744,20 @@ func (this *ActivityStreamsToProperty) PrependTootEmoji(v vocab.TootEmoji) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "to". Invalidates all iterators.
+func (this *ActivityStreamsToProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsToPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependTootIdentityProof prepends a IdentityProof value to the front of a list
 // of the property "to". Invalidates all iterators.
 func (this *ActivityStreamsToProperty) PrependTootIdentityProof(v vocab.TootIdentityProof) {
@@ -6984,83 +6526,6 @@ func (this *ActivityStreamsToProperty) SetActivityStreamsView(idx int, v vocab.A
 	}
 }
 
-// SetForgeFedBranch sets a Branch value to be at the specified index for the
-// property "to". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsToProperty) SetForgeFedBranch(idx int, v vocab.ForgeFedBranch) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedBranchMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedCommit sets a Commit value to be at the specified index for the
-// property "to". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsToProperty) SetForgeFedCommit(idx int, v vocab.ForgeFedCommit) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedCommitMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedPush sets a Push value to be at the specified index for the property
-// "to". Panics if the index is out of bounds. Invalidates all iterators.
-func (this *ActivityStreamsToProperty) SetForgeFedPush(idx int, v vocab.ForgeFedPush) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsToPropertyIterator{
-		alias:              this.alias,
-		forgefedPushMember: v,
-		myIdx:              idx,
-		parent:             this,
-	}
-}
-
-// SetForgeFedRepository sets a Repository value to be at the specified index for
-// the property "to". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsToProperty) SetForgeFedRepository(idx int, v vocab.ForgeFedRepository) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                    this.alias,
-		forgefedRepositoryMember: v,
-		myIdx:                    idx,
-		parent:                   this,
-	}
-}
-
-// SetForgeFedTicket sets a Ticket value to be at the specified index for the
-// property "to". Panics if the index is out of bounds. Invalidates all
-// iterators.
-func (this *ActivityStreamsToProperty) SetForgeFedTicket(idx int, v vocab.ForgeFedTicket) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                this.alias,
-		forgefedTicketMember: v,
-		myIdx:                idx,
-		parent:               this,
-	}
-}
-
-// SetForgeFedTicketDependency sets a TicketDependency value to be at the
-// specified index for the property "to". Panics if the index is out of
-// bounds. Invalidates all iterators.
-func (this *ActivityStreamsToProperty) SetForgeFedTicketDependency(idx int, v vocab.ForgeFedTicketDependency) {
-	(this.properties)[idx].parent = nil
-	(this.properties)[idx] = &ActivityStreamsToPropertyIterator{
-		alias:                          this.alias,
-		forgefedTicketDependencyMember: v,
-		myIdx:                          idx,
-		parent:                         this,
-	}
-}
-
 // SetIRI sets an IRI value to be at the specified index for the property "to".
 // Panics if the index is out of bounds.
 func (this *ActivityStreamsToProperty) SetIRI(idx int, v *url.URL) {
@@ -7098,6 +6563,19 @@ func (this *ActivityStreamsToProperty) SetTootEmoji(idx int, v vocab.TootEmoji)
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "to". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsToProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsToPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetTootIdentityProof sets a IdentityProof value to be at the specified index
 // for the property "to". Panics if the index is out of bounds. Invalidates
 // all iterators.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_url/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_url/gen_pkg.go
index cad89cd63..9a636a774 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_url/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_url/gen_pkg.go
@@ -9,6 +9,9 @@ var mgr privateManager
 // privateManager abstracts the code-generated manager that provides access to
 // concrete implementations.
 type privateManager interface {
+	// DeserializeHashtagToot returns the deserialization method for the
+	// "TootHashtag" non-functional property in the vocabulary "Toot"
+	DeserializeHashtagToot() func(map[string]interface{}, map[string]string) (vocab.TootHashtag, error)
 	// DeserializeLinkActivityStreams returns the deserialization method for
 	// the "ActivityStreamsLink" non-functional property in the vocabulary
 	// "ActivityStreams"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_url/gen_property_activitystreams_url.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_url/gen_property_activitystreams_url.go
index 79719e452..ac8cf84c6 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_url/gen_property_activitystreams_url.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/property_url/gen_property_activitystreams_url.go
@@ -17,6 +17,7 @@ import (
 type ActivityStreamsUrlPropertyIterator struct {
 	xmlschemaAnyURIMember        *url.URL
 	activitystreamsLinkMember    vocab.ActivityStreamsLink
+	tootHashtagMember            vocab.TootHashtag
 	activitystreamsMentionMember vocab.ActivityStreamsMention
 	unknown                      interface{}
 	alias                        string
@@ -43,6 +44,12 @@ func deserializeActivityStreamsUrlPropertyIterator(i interface{}, aliasMap map[s
 				alias:                     alias,
 			}
 			return this, nil
+		} else if v, err := mgr.DeserializeHashtagToot()(m, aliasMap); err == nil {
+			this := &ActivityStreamsUrlPropertyIterator{
+				alias:             alias,
+				tootHashtagMember: v,
+			}
+			return this, nil
 		} else if v, err := mgr.DeserializeMentionActivityStreams()(m, aliasMap); err == nil {
 			this := &ActivityStreamsUrlPropertyIterator{
 				activitystreamsMentionMember: v,
@@ -85,12 +92,21 @@ func (this ActivityStreamsUrlPropertyIterator) GetIRI() *url.URL {
 	return this.xmlschemaAnyURIMember
 }
 
+// GetTootHashtag returns the value of this property. When IsTootHashtag returns
+// false, GetTootHashtag will return an arbitrary value.
+func (this ActivityStreamsUrlPropertyIterator) GetTootHashtag() vocab.TootHashtag {
+	return this.tootHashtagMember
+}
+
 // GetType returns the value in this property as a Type. Returns nil if the value
 // is not an ActivityStreams type, such as an IRI or another value.
 func (this ActivityStreamsUrlPropertyIterator) GetType() vocab.Type {
 	if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink()
 	}
+	if this.IsTootHashtag() {
+		return this.GetTootHashtag()
+	}
 	if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention()
 	}
@@ -108,6 +124,7 @@ func (this ActivityStreamsUrlPropertyIterator) GetXMLSchemaAnyURI() *url.URL {
 func (this ActivityStreamsUrlPropertyIterator) HasAny() bool {
 	return this.IsXMLSchemaAnyURI() ||
 		this.IsActivityStreamsLink() ||
+		this.IsTootHashtag() ||
 		this.IsActivityStreamsMention()
 }
 
@@ -131,6 +148,13 @@ func (this ActivityStreamsUrlPropertyIterator) IsIRI() bool {
 	return this.xmlschemaAnyURIMember != nil
 }
 
+// IsTootHashtag returns true if this property has a type of "Hashtag". When true,
+// use the GetTootHashtag and SetTootHashtag methods to access and set this
+// property.
+func (this ActivityStreamsUrlPropertyIterator) IsTootHashtag() bool {
+	return this.tootHashtagMember != nil
+}
+
 // IsXMLSchemaAnyURI returns true if this property has a type of "anyURI". When
 // true, use the GetXMLSchemaAnyURI and SetXMLSchemaAnyURI methods to access
 // and set this property.
@@ -146,6 +170,8 @@ func (this ActivityStreamsUrlPropertyIterator) JSONLDContext() map[string]string
 	var child map[string]string
 	if this.IsActivityStreamsLink() {
 		child = this.GetActivityStreamsLink().JSONLDContext()
+	} else if this.IsTootHashtag() {
+		child = this.GetTootHashtag().JSONLDContext()
 	} else if this.IsActivityStreamsMention() {
 		child = this.GetActivityStreamsMention().JSONLDContext()
 	}
@@ -170,9 +196,12 @@ func (this ActivityStreamsUrlPropertyIterator) KindIndex() int {
 	if this.IsActivityStreamsLink() {
 		return 1
 	}
-	if this.IsActivityStreamsMention() {
+	if this.IsTootHashtag() {
 		return 2
 	}
+	if this.IsActivityStreamsMention() {
+		return 3
+	}
 	if this.IsIRI() {
 		return -2
 	}
@@ -194,6 +223,8 @@ func (this ActivityStreamsUrlPropertyIterator) LessThan(o vocab.ActivityStreamsU
 		return anyuri.LessAnyURI(this.GetXMLSchemaAnyURI(), o.GetXMLSchemaAnyURI())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().LessThan(o.GetActivityStreamsLink())
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().LessThan(o.GetTootHashtag())
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().LessThan(o.GetActivityStreamsMention())
 	}
@@ -247,6 +278,13 @@ func (this *ActivityStreamsUrlPropertyIterator) SetIRI(v *url.URL) {
 	this.SetXMLSchemaAnyURI(v)
 }
 
+// SetTootHashtag sets the value of this property. Calling IsTootHashtag
+// afterwards returns true.
+func (this *ActivityStreamsUrlPropertyIterator) SetTootHashtag(v vocab.TootHashtag) {
+	this.clear()
+	this.tootHashtagMember = v
+}
+
 // SetType attempts to set the property for the arbitrary type. Returns an error
 // if it is not a valid type to set on this property.
 func (this *ActivityStreamsUrlPropertyIterator) SetType(t vocab.Type) error {
@@ -254,6 +292,10 @@ func (this *ActivityStreamsUrlPropertyIterator) SetType(t vocab.Type) error {
 		this.SetActivityStreamsLink(v)
 		return nil
 	}
+	if v, ok := t.(vocab.TootHashtag); ok {
+		this.SetTootHashtag(v)
+		return nil
+	}
 	if v, ok := t.(vocab.ActivityStreamsMention); ok {
 		this.SetActivityStreamsMention(v)
 		return nil
@@ -274,6 +316,7 @@ func (this *ActivityStreamsUrlPropertyIterator) SetXMLSchemaAnyURI(v *url.URL) {
 func (this *ActivityStreamsUrlPropertyIterator) clear() {
 	this.xmlschemaAnyURIMember = nil
 	this.activitystreamsLinkMember = nil
+	this.tootHashtagMember = nil
 	this.activitystreamsMentionMember = nil
 	this.unknown = nil
 }
@@ -287,6 +330,8 @@ func (this ActivityStreamsUrlPropertyIterator) serialize() (interface{}, error)
 		return anyuri.SerializeAnyURI(this.GetXMLSchemaAnyURI())
 	} else if this.IsActivityStreamsLink() {
 		return this.GetActivityStreamsLink().Serialize()
+	} else if this.IsTootHashtag() {
+		return this.GetTootHashtag().Serialize()
 	} else if this.IsActivityStreamsMention() {
 		return this.GetActivityStreamsMention().Serialize()
 	}
@@ -380,6 +425,17 @@ func (this *ActivityStreamsUrlProperty) AppendIRI(v *url.URL) {
 	})
 }
 
+// AppendTootHashtag appends a Hashtag value to the back of a list of the property
+// "url". Invalidates iterators that are traversing using Prev.
+func (this *ActivityStreamsUrlProperty) AppendTootHashtag(v vocab.TootHashtag) {
+	this.properties = append(this.properties, &ActivityStreamsUrlPropertyIterator{
+		alias:             this.alias,
+		myIdx:             this.Len(),
+		parent:            this,
+		tootHashtagMember: v,
+	})
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "url". Invalidates iterators that are traversing using Prev.
 // Returns an error if the type is not a valid one to set for this property.
@@ -487,6 +543,23 @@ func (this *ActivityStreamsUrlProperty) InsertIRI(idx int, v *url.URL) {
 	}
 }
 
+// InsertTootHashtag inserts a Hashtag value at the specified index for a property
+// "url". Existing elements at that index and higher are shifted back once.
+// Invalidates all iterators.
+func (this *ActivityStreamsUrlProperty) InsertTootHashtag(idx int, v vocab.TootHashtag) {
+	this.properties = append(this.properties, nil)
+	copy(this.properties[idx+1:], this.properties[idx:])
+	this.properties[idx] = &ActivityStreamsUrlPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+	for i := idx; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "url". Invalidates all iterators. Returns an error if the type is
 // not a valid one to set for this property.
@@ -574,6 +647,10 @@ func (this ActivityStreamsUrlProperty) Less(i, j int) bool {
 			rhs := this.properties[j].GetActivityStreamsLink()
 			return lhs.LessThan(rhs)
 		} else if idx1 == 2 {
+			lhs := this.properties[i].GetTootHashtag()
+			rhs := this.properties[j].GetTootHashtag()
+			return lhs.LessThan(rhs)
+		} else if idx1 == 3 {
 			lhs := this.properties[i].GetActivityStreamsMention()
 			rhs := this.properties[j].GetActivityStreamsMention()
 			return lhs.LessThan(rhs)
@@ -657,6 +734,20 @@ func (this *ActivityStreamsUrlProperty) PrependIRI(v *url.URL) {
 	}
 }
 
+// PrependTootHashtag prepends a Hashtag value to the front of a list of the
+// property "url". Invalidates all iterators.
+func (this *ActivityStreamsUrlProperty) PrependTootHashtag(v vocab.TootHashtag) {
+	this.properties = append([]*ActivityStreamsUrlPropertyIterator{{
+		alias:             this.alias,
+		myIdx:             0,
+		parent:            this,
+		tootHashtagMember: v,
+	}}, this.properties...)
+	for i := 1; i < this.Len(); i++ {
+		(this.properties)[i].myIdx = i
+	}
+}
+
 // PrependType prepends an arbitrary type value to the front of a list of the
 // property "url". Invalidates all iterators. Returns an error if the type is
 // not a valid one to set for this property.
@@ -761,6 +852,19 @@ func (this *ActivityStreamsUrlProperty) SetIRI(idx int, v *url.URL) {
 	}
 }
 
+// SetTootHashtag sets a Hashtag value to be at the specified index for the
+// property "url". Panics if the index is out of bounds. Invalidates all
+// iterators.
+func (this *ActivityStreamsUrlProperty) SetTootHashtag(idx int, v vocab.TootHashtag) {
+	(this.properties)[idx].parent = nil
+	(this.properties)[idx] = &ActivityStreamsUrlPropertyIterator{
+		alias:             this.alias,
+		myIdx:             idx,
+		parent:            this,
+		tootHashtagMember: v,
+	}
+}
+
 // SetType sets an arbitrary type value to the specified index of the property
 // "url". Invalidates all iterators. Returns an error if the type is not a
 // valid one to set for this property. Panics if the index is out of bounds.
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_accept/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_accept/gen_pkg.go
index 6e25594be..18258d74f 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_accept/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_accept/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_accept/gen_type_activitystreams_accept.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_accept/gen_type_activitystreams_accept.go
index 2e5b2a324..007d7fe83 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_accept/gen_type_activitystreams_accept.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_accept/gen_type_activitystreams_accept.go
@@ -83,10 +83,7 @@ type ActivityStreamsAccept struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -97,7 +94,7 @@ type ActivityStreamsAccept struct {
 // AcceptIsDisjointWith returns true if the other provided type is disjoint with
 // the Accept type.
 func AcceptIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -343,26 +340,11 @@ func DeserializeAccept(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -459,14 +441,8 @@ func DeserializeAccept(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -722,23 +698,6 @@ func (this ActivityStreamsAccept) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsAccept) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsAccept) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsAccept) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsAccept) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -809,10 +768,7 @@ func (this ActivityStreamsAccept) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1314,34 +1270,6 @@ func (this ActivityStreamsAccept) LessThan(o vocab.ActivityStreamsAccept) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1356,20 +1284,6 @@ func (this ActivityStreamsAccept) LessThan(o vocab.ActivityStreamsAccept) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1715,22 +1629,6 @@ func (this ActivityStreamsAccept) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1739,14 +1637,6 @@ func (this ActivityStreamsAccept) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1970,21 +1860,6 @@ func (this *ActivityStreamsAccept) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsAccept) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsAccept) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsAccept) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsAccept) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_activity/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_activity/gen_pkg.go
index 8e050beed..926ad51c7 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_activity/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_activity/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_activity/gen_type_activitystreams_activity.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_activity/gen_type_activitystreams_activity.go
index 4e4628358..225567983 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_activity/gen_type_activitystreams_activity.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_activity/gen_type_activitystreams_activity.go
@@ -63,10 +63,7 @@ type ActivityStreamsActivity struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -77,7 +74,7 @@ type ActivityStreamsActivity struct {
 // ActivityIsDisjointWith returns true if the other provided type is disjoint with
 // the Activity type.
 func ActivityIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -90,7 +87,7 @@ func ActivityIsDisjointWith(other vocab.Type) bool {
 // Activity type. Note that it returns false if the types are the same; see
 // the "IsOrExtendsActivity" variant instead.
 func ActivityIsExtendedBy(other vocab.Type) bool {
-	extensions := []string{"Accept", "Add", "Announce", "Arrive", "Block", "Create", "Delete", "Dislike", "Flag", "Follow", "Ignore", "IntransitiveActivity", "Invite", "Join", "Leave", "Like", "Listen", "Move", "Offer", "Push", "Question", "Read", "Reject", "Remove", "TentativeAccept", "TentativeReject", "Travel", "Undo", "Update", "View"}
+	extensions := []string{"Accept", "Add", "Announce", "Arrive", "Block", "Create", "Delete", "Dislike", "Flag", "Follow", "Ignore", "IntransitiveActivity", "Invite", "Join", "Leave", "Like", "Listen", "Move", "Offer", "Question", "Read", "Reject", "Remove", "TentativeAccept", "TentativeReject", "Travel", "Undo", "Update", "View"}
 	for _, ext := range extensions {
 		if ext == other.GetTypeName() {
 			return true
@@ -323,26 +320,11 @@ func DeserializeActivity(m map[string]interface{}, aliasMap map[string]string) (
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -439,14 +421,8 @@ func DeserializeActivity(m map[string]interface{}, aliasMap map[string]string) (
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -702,23 +678,6 @@ func (this ActivityStreamsActivity) GetActivityStreamsUrl() vocab.ActivityStream
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsActivity) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsActivity) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsActivity) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsActivity) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -789,10 +748,7 @@ func (this ActivityStreamsActivity) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1294,34 +1250,6 @@ func (this ActivityStreamsActivity) LessThan(o vocab.ActivityStreamsActivity) bo
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1336,20 +1264,6 @@ func (this ActivityStreamsActivity) LessThan(o vocab.ActivityStreamsActivity) bo
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1695,22 +1609,6 @@ func (this ActivityStreamsActivity) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1719,14 +1617,6 @@ func (this ActivityStreamsActivity) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1950,21 +1840,6 @@ func (this *ActivityStreamsActivity) SetActivityStreamsUrl(i vocab.ActivityStrea
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsActivity) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsActivity) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsActivity) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsActivity) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_add/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_add/gen_pkg.go
index 326f6a5a4..825e0c52a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_add/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_add/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_add/gen_type_activitystreams_add.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_add/gen_type_activitystreams_add.go
index adc3be875..8cc21ded3 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_add/gen_type_activitystreams_add.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_add/gen_type_activitystreams_add.go
@@ -83,10 +83,7 @@ type ActivityStreamsAdd struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -109,7 +106,7 @@ func ActivityStreamsAddExtends(other vocab.Type) bool {
 // AddIsDisjointWith returns true if the other provided type is disjoint with the
 // Add type.
 func AddIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -338,26 +335,11 @@ func DeserializeAdd(m map[string]interface{}, aliasMap map[string]string) (*Acti
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -454,14 +436,8 @@ func DeserializeAdd(m map[string]interface{}, aliasMap map[string]string) (*Acti
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -717,23 +693,6 @@ func (this ActivityStreamsAdd) GetActivityStreamsUrl() vocab.ActivityStreamsUrlP
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsAdd) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsAdd) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsAdd) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsAdd) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -804,10 +763,7 @@ func (this ActivityStreamsAdd) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1309,34 +1265,6 @@ func (this ActivityStreamsAdd) LessThan(o vocab.ActivityStreamsAdd) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1351,20 +1279,6 @@ func (this ActivityStreamsAdd) LessThan(o vocab.ActivityStreamsAdd) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1710,22 +1624,6 @@ func (this ActivityStreamsAdd) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1734,14 +1632,6 @@ func (this ActivityStreamsAdd) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1965,21 +1855,6 @@ func (this *ActivityStreamsAdd) SetActivityStreamsUrl(i vocab.ActivityStreamsUrl
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsAdd) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsAdd) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsAdd) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsAdd) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_announce/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_announce/gen_pkg.go
index af1af29d9..5302ba8fc 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_announce/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_announce/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_announce/gen_type_activitystreams_announce.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_announce/gen_type_activitystreams_announce.go
index e8ee9a453..db4c523e7 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_announce/gen_type_activitystreams_announce.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_announce/gen_type_activitystreams_announce.go
@@ -65,10 +65,7 @@ type ActivityStreamsAnnounce struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -91,7 +88,7 @@ func ActivityStreamsAnnounceExtends(other vocab.Type) bool {
 // AnnounceIsDisjointWith returns true if the other provided type is disjoint with
 // the Announce type.
 func AnnounceIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -320,26 +317,11 @@ func DeserializeAnnounce(m map[string]interface{}, aliasMap map[string]string) (
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -436,14 +418,8 @@ func DeserializeAnnounce(m map[string]interface{}, aliasMap map[string]string) (
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -699,23 +675,6 @@ func (this ActivityStreamsAnnounce) GetActivityStreamsUrl() vocab.ActivityStream
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsAnnounce) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsAnnounce) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsAnnounce) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsAnnounce) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -786,10 +745,7 @@ func (this ActivityStreamsAnnounce) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1291,34 +1247,6 @@ func (this ActivityStreamsAnnounce) LessThan(o vocab.ActivityStreamsAnnounce) bo
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1333,20 +1261,6 @@ func (this ActivityStreamsAnnounce) LessThan(o vocab.ActivityStreamsAnnounce) bo
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1692,22 +1606,6 @@ func (this ActivityStreamsAnnounce) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1716,14 +1614,6 @@ func (this ActivityStreamsAnnounce) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1947,21 +1837,6 @@ func (this *ActivityStreamsAnnounce) SetActivityStreamsUrl(i vocab.ActivityStrea
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsAnnounce) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsAnnounce) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsAnnounce) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsAnnounce) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_application/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_application/gen_pkg.go
index 8be8e825a..035ad65f0 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_application/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_application/gen_pkg.go
@@ -182,22 +182,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_application/gen_type_activitystreams_application.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_application/gen_type_activitystreams_application.go
index a9ccc244c..44756ee6b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_application/gen_type_activitystreams_application.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_application/gen_type_activitystreams_application.go
@@ -58,10 +58,7 @@ type ActivityStreamsApplication struct {
 	ActivityStreamsStreams                   vocab.ActivityStreamsStreamsProperty
 	ActivityStreamsSummary                   vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag                       vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                             vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy                 vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo                        vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor                 vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                               vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated                   vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl                       vocab.ActivityStreamsUrlProperty
@@ -84,7 +81,7 @@ func ActivityStreamsApplicationExtends(other vocab.Type) bool {
 // ApplicationIsDisjointWith returns true if the other provided type is disjoint
 // with the Application type.
 func ApplicationIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -348,26 +345,11 @@ func DeserializeApplication(m map[string]interface{}, aliasMap map[string]string
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -480,14 +462,8 @@ func DeserializeApplication(m map[string]interface{}, aliasMap map[string]string
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -767,23 +743,6 @@ func (this ActivityStreamsApplication) GetActivityStreamsUrl() vocab.ActivityStr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsApplication) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsApplication) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsApplication) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsApplication) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -878,10 +837,7 @@ func (this ActivityStreamsApplication) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStreams, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1481,34 +1437,6 @@ func (this ActivityStreamsApplication) LessThan(o vocab.ActivityStreamsApplicati
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1523,20 +1451,6 @@ func (this ActivityStreamsApplication) LessThan(o vocab.ActivityStreamsApplicati
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1938,22 +1852,6 @@ func (this ActivityStreamsApplication) Serialize() (map[string]interface{}, erro
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1962,14 +1860,6 @@ func (this ActivityStreamsApplication) Serialize() (map[string]interface{}, erro
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -2214,21 +2104,6 @@ func (this *ActivityStreamsApplication) SetActivityStreamsUrl(i vocab.ActivitySt
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsApplication) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsApplication) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsApplication) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsApplication) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_arrive/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_arrive/gen_pkg.go
index 1ee179dd4..84f392539 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_arrive/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_arrive/gen_pkg.go
@@ -148,22 +148,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_arrive/gen_type_activitystreams_arrive.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_arrive/gen_type_activitystreams_arrive.go
index 20dcbec22..41034274b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_arrive/gen_type_activitystreams_arrive.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_arrive/gen_type_activitystreams_arrive.go
@@ -64,10 +64,7 @@ type ActivityStreamsArrive struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -90,7 +87,7 @@ func ActivityStreamsArriveExtends(other vocab.Type) bool {
 // ArriveIsDisjointWith returns true if the other provided type is disjoint with
 // the Arrive type.
 func ArriveIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -314,26 +311,11 @@ func DeserializeArrive(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -428,14 +410,8 @@ func DeserializeArrive(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -685,23 +661,6 @@ func (this ActivityStreamsArrive) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsArrive) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsArrive) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsArrive) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsArrive) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -771,10 +730,7 @@ func (this ActivityStreamsArrive) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1262,34 +1218,6 @@ func (this ActivityStreamsArrive) LessThan(o vocab.ActivityStreamsArrive) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1304,20 +1232,6 @@ func (this ActivityStreamsArrive) LessThan(o vocab.ActivityStreamsArrive) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1655,22 +1569,6 @@ func (this ActivityStreamsArrive) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1679,14 +1577,6 @@ func (this ActivityStreamsArrive) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1905,21 +1795,6 @@ func (this *ActivityStreamsArrive) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsArrive) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsArrive) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsArrive) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsArrive) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_article/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_article/gen_pkg.go
index eafe0ec1f..ffd0619d8 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_article/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_article/gen_pkg.go
@@ -132,22 +132,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_article/gen_type_activitystreams_article.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_article/gen_type_activitystreams_article.go
index 95e4c8c2c..63a8dda98 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_article/gen_type_activitystreams_article.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_article/gen_type_activitystreams_article.go
@@ -49,10 +49,7 @@ type ActivityStreamsArticle struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -75,7 +72,7 @@ func ActivityStreamsArticleExtends(other vocab.Type) bool {
 // ArticleIsDisjointWith returns true if the other provided type is disjoint with
 // the Article type.
 func ArticleIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -279,26 +276,11 @@ func DeserializeArticle(m map[string]interface{}, aliasMap map[string]string) (*
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -385,14 +367,8 @@ func DeserializeArticle(m map[string]interface{}, aliasMap map[string]string) (*
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -618,23 +594,6 @@ func (this ActivityStreamsArticle) GetActivityStreamsUrl() vocab.ActivityStreams
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsArticle) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsArticle) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsArticle) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsArticle) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -700,10 +659,7 @@ func (this ActivityStreamsArticle) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1135,34 +1091,6 @@ func (this ActivityStreamsArticle) LessThan(o vocab.ActivityStreamsArticle) bool
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1177,20 +1105,6 @@ func (this ActivityStreamsArticle) LessThan(o vocab.ActivityStreamsArticle) bool
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1496,22 +1410,6 @@ func (this ActivityStreamsArticle) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1520,14 +1418,6 @@ func (this ActivityStreamsArticle) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1726,21 +1616,6 @@ func (this *ActivityStreamsArticle) SetActivityStreamsUrl(i vocab.ActivityStream
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsArticle) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsArticle) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsArticle) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsArticle) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_audio/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_audio/gen_pkg.go
index 45af5af65..88a4c990a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_audio/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_audio/gen_pkg.go
@@ -136,22 +136,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_audio/gen_type_activitystreams_audio.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_audio/gen_type_activitystreams_audio.go
index 1f23a82ef..d88a72fc7 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_audio/gen_type_activitystreams_audio.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_audio/gen_type_activitystreams_audio.go
@@ -52,10 +52,7 @@ type ActivityStreamsAudio struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -78,7 +75,7 @@ func ActivityStreamsAudioExtends(other vocab.Type) bool {
 // AudioIsDisjointWith returns true if the other provided type is disjoint with
 // the Audio type.
 func AudioIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -287,26 +284,11 @@ func DeserializeAudio(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -395,14 +377,8 @@ func DeserializeAudio(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -628,23 +604,6 @@ func (this ActivityStreamsAudio) GetActivityStreamsUrl() vocab.ActivityStreamsUr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsAudio) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsAudio) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsAudio) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsAudio) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -716,10 +675,7 @@ func (this ActivityStreamsAudio) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1165,34 +1121,6 @@ func (this ActivityStreamsAudio) LessThan(o vocab.ActivityStreamsAudio) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1207,20 +1135,6 @@ func (this ActivityStreamsAudio) LessThan(o vocab.ActivityStreamsAudio) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1534,22 +1448,6 @@ func (this ActivityStreamsAudio) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1558,14 +1456,6 @@ func (this ActivityStreamsAudio) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1764,21 +1654,6 @@ func (this *ActivityStreamsAudio) SetActivityStreamsUrl(i vocab.ActivityStreamsU
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsAudio) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsAudio) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsAudio) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsAudio) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_block/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_block/gen_pkg.go
index f96cdce5c..f3c53b839 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_block/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_block/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_block/gen_type_activitystreams_block.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_block/gen_type_activitystreams_block.go
index c7e3212bd..7ebd80c23 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_block/gen_type_activitystreams_block.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_block/gen_type_activitystreams_block.go
@@ -56,10 +56,7 @@ type ActivityStreamsBlock struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -82,7 +79,7 @@ func ActivityStreamsBlockExtends(other vocab.Type) bool {
 // BlockIsDisjointWith returns true if the other provided type is disjoint with
 // the Block type.
 func BlockIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -311,26 +308,11 @@ func DeserializeBlock(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -427,14 +409,8 @@ func DeserializeBlock(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -690,23 +666,6 @@ func (this ActivityStreamsBlock) GetActivityStreamsUrl() vocab.ActivityStreamsUr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsBlock) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsBlock) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsBlock) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsBlock) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -777,10 +736,7 @@ func (this ActivityStreamsBlock) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1282,34 +1238,6 @@ func (this ActivityStreamsBlock) LessThan(o vocab.ActivityStreamsBlock) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1324,20 +1252,6 @@ func (this ActivityStreamsBlock) LessThan(o vocab.ActivityStreamsBlock) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1683,22 +1597,6 @@ func (this ActivityStreamsBlock) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1707,14 +1605,6 @@ func (this ActivityStreamsBlock) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1938,21 +1828,6 @@ func (this *ActivityStreamsBlock) SetActivityStreamsUrl(i vocab.ActivityStreamsU
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsBlock) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsBlock) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsBlock) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsBlock) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collection/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collection/gen_pkg.go
index 8d3067544..ed69fbcb9 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collection/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collection/gen_pkg.go
@@ -148,14 +148,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -164,10 +156,6 @@ type privateManager interface {
 	// deserialization method for the "ActivityStreamsTotalItemsProperty"
 	// non-functional property in the vocabulary "ActivityStreams"
 	DeserializeTotalItemsPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTotalItemsProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collection/gen_type_activitystreams_collection.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collection/gen_type_activitystreams_collection.go
index b00075b56..bd0aba42a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collection/gen_type_activitystreams_collection.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collection/gen_type_activitystreams_collection.go
@@ -63,11 +63,8 @@ type ActivityStreamsCollection struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
 	ActivityStreamsTotalItems   vocab.ActivityStreamsTotalItemsProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -90,7 +87,7 @@ func ActivityStreamsCollectionExtends(other vocab.Type) bool {
 // CollectionIsDisjointWith returns true if the other provided type is disjoint
 // with the Collection type.
 func CollectionIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -319,16 +316,6 @@ func DeserializeCollection(m map[string]interface{}, aliasMap map[string]string)
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -339,11 +326,6 @@ func DeserializeCollection(m map[string]interface{}, aliasMap map[string]string)
 	} else if p != nil {
 		this.ActivityStreamsTotalItems = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -438,16 +420,10 @@ func DeserializeCollection(m map[string]interface{}, aliasMap map[string]string)
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
 		} else if k == "totalItems" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -703,23 +679,6 @@ func (this ActivityStreamsCollection) GetActivityStreamsUrl() vocab.ActivityStre
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsCollection) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsCollection) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsCollection) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsCollection) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -789,11 +748,8 @@ func (this ActivityStreamsCollection) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTotalItems, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1281,34 +1237,6 @@ func (this ActivityStreamsCollection) LessThan(o vocab.ActivityStreamsCollection
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1337,20 +1265,6 @@ func (this ActivityStreamsCollection) LessThan(o vocab.ActivityStreamsCollection
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1688,22 +1602,6 @@ func (this ActivityStreamsCollection) Serialize() (map[string]interface{}, error
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1720,14 +1618,6 @@ func (this ActivityStreamsCollection) Serialize() (map[string]interface{}, error
 			m[this.ActivityStreamsTotalItems.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1951,21 +1841,6 @@ func (this *ActivityStreamsCollection) SetActivityStreamsUrl(i vocab.ActivityStr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsCollection) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsCollection) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsCollection) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsCollection) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collectionpage/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collectionpage/gen_pkg.go
index a8564ef5e..ecfe4360a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collectionpage/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collectionpage/gen_pkg.go
@@ -160,14 +160,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -176,10 +168,6 @@ type privateManager interface {
 	// deserialization method for the "ActivityStreamsTotalItemsProperty"
 	// non-functional property in the vocabulary "ActivityStreams"
 	DeserializeTotalItemsPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTotalItemsProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collectionpage/gen_type_activitystreams_collectionpage.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collectionpage/gen_type_activitystreams_collectionpage.go
index 47d9f79f1..b406bc30d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collectionpage/gen_type_activitystreams_collectionpage.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_collectionpage/gen_type_activitystreams_collectionpage.go
@@ -67,11 +67,8 @@ type ActivityStreamsCollectionPage struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
 	ActivityStreamsTotalItems   vocab.ActivityStreamsTotalItemsProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -94,7 +91,7 @@ func ActivityStreamsCollectionPageExtends(other vocab.Type) bool {
 // CollectionPageIsDisjointWith returns true if the other provided type is
 // disjoint with the CollectionPage type.
 func CollectionPageIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -338,16 +335,6 @@ func DeserializeCollectionPage(m map[string]interface{}, aliasMap map[string]str
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -358,11 +345,6 @@ func DeserializeCollectionPage(m map[string]interface{}, aliasMap map[string]str
 	} else if p != nil {
 		this.ActivityStreamsTotalItems = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -463,16 +445,10 @@ func DeserializeCollectionPage(m map[string]interface{}, aliasMap map[string]str
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
 		} else if k == "totalItems" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -746,23 +722,6 @@ func (this ActivityStreamsCollectionPage) GetActivityStreamsUrl() vocab.Activity
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsCollectionPage) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsCollectionPage) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsCollectionPage) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsCollectionPage) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -835,11 +794,8 @@ func (this ActivityStreamsCollectionPage) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTotalItems, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1369,34 +1325,6 @@ func (this ActivityStreamsCollectionPage) LessThan(o vocab.ActivityStreamsCollec
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1425,20 +1353,6 @@ func (this ActivityStreamsCollectionPage) LessThan(o vocab.ActivityStreamsCollec
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1800,22 +1714,6 @@ func (this ActivityStreamsCollectionPage) Serialize() (map[string]interface{}, e
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1832,14 +1730,6 @@ func (this ActivityStreamsCollectionPage) Serialize() (map[string]interface{}, e
 			m[this.ActivityStreamsTotalItems.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -2078,21 +1968,6 @@ func (this *ActivityStreamsCollectionPage) SetActivityStreamsUrl(i vocab.Activit
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsCollectionPage) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsCollectionPage) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsCollectionPage) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsCollectionPage) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_create/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_create/gen_pkg.go
index b582b43a9..52972d67b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_create/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_create/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_create/gen_type_activitystreams_create.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_create/gen_type_activitystreams_create.go
index 1dde08a5a..2ab6b350e 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_create/gen_type_activitystreams_create.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_create/gen_type_activitystreams_create.go
@@ -60,10 +60,7 @@ type ActivityStreamsCreate struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -86,7 +83,7 @@ func ActivityStreamsCreateExtends(other vocab.Type) bool {
 // CreateIsDisjointWith returns true if the other provided type is disjoint with
 // the Create type.
 func CreateIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -315,26 +312,11 @@ func DeserializeCreate(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -431,14 +413,8 @@ func DeserializeCreate(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -694,23 +670,6 @@ func (this ActivityStreamsCreate) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsCreate) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsCreate) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsCreate) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsCreate) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -781,10 +740,7 @@ func (this ActivityStreamsCreate) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1286,34 +1242,6 @@ func (this ActivityStreamsCreate) LessThan(o vocab.ActivityStreamsCreate) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1328,20 +1256,6 @@ func (this ActivityStreamsCreate) LessThan(o vocab.ActivityStreamsCreate) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1687,22 +1601,6 @@ func (this ActivityStreamsCreate) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1711,14 +1609,6 @@ func (this ActivityStreamsCreate) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1942,21 +1832,6 @@ func (this *ActivityStreamsCreate) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsCreate) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsCreate) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsCreate) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsCreate) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_delete/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_delete/gen_pkg.go
index b0908cbb0..9b246faa1 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_delete/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_delete/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_delete/gen_type_activitystreams_delete.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_delete/gen_type_activitystreams_delete.go
index 43dedbac3..cc007c935 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_delete/gen_type_activitystreams_delete.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_delete/gen_type_activitystreams_delete.go
@@ -61,10 +61,7 @@ type ActivityStreamsDelete struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -87,7 +84,7 @@ func ActivityStreamsDeleteExtends(other vocab.Type) bool {
 // DeleteIsDisjointWith returns true if the other provided type is disjoint with
 // the Delete type.
 func DeleteIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -316,26 +313,11 @@ func DeserializeDelete(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -432,14 +414,8 @@ func DeserializeDelete(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -695,23 +671,6 @@ func (this ActivityStreamsDelete) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsDelete) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsDelete) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsDelete) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsDelete) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -782,10 +741,7 @@ func (this ActivityStreamsDelete) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1287,34 +1243,6 @@ func (this ActivityStreamsDelete) LessThan(o vocab.ActivityStreamsDelete) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1329,20 +1257,6 @@ func (this ActivityStreamsDelete) LessThan(o vocab.ActivityStreamsDelete) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1688,22 +1602,6 @@ func (this ActivityStreamsDelete) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1712,14 +1610,6 @@ func (this ActivityStreamsDelete) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1943,21 +1833,6 @@ func (this *ActivityStreamsDelete) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsDelete) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsDelete) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsDelete) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsDelete) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_dislike/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_dislike/gen_pkg.go
index 876e5d113..e2f767abf 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_dislike/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_dislike/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_dislike/gen_type_activitystreams_dislike.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_dislike/gen_type_activitystreams_dislike.go
index e0dc27cd5..161fff86e 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_dislike/gen_type_activitystreams_dislike.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_dislike/gen_type_activitystreams_dislike.go
@@ -53,10 +53,7 @@ type ActivityStreamsDislike struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -288,26 +285,11 @@ func DeserializeDislike(m map[string]interface{}, aliasMap map[string]string) (*
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -404,14 +386,8 @@ func DeserializeDislike(m map[string]interface{}, aliasMap map[string]string) (*
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -430,7 +406,7 @@ func DeserializeDislike(m map[string]interface{}, aliasMap map[string]string) (*
 // DislikeIsDisjointWith returns true if the other provided type is disjoint with
 // the Dislike type.
 func DislikeIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -687,23 +663,6 @@ func (this ActivityStreamsDislike) GetActivityStreamsUrl() vocab.ActivityStreams
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsDislike) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsDislike) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsDislike) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsDislike) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -774,10 +733,7 @@ func (this ActivityStreamsDislike) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1279,34 +1235,6 @@ func (this ActivityStreamsDislike) LessThan(o vocab.ActivityStreamsDislike) bool
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1321,20 +1249,6 @@ func (this ActivityStreamsDislike) LessThan(o vocab.ActivityStreamsDislike) bool
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1680,22 +1594,6 @@ func (this ActivityStreamsDislike) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1704,14 +1602,6 @@ func (this ActivityStreamsDislike) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1935,21 +1825,6 @@ func (this *ActivityStreamsDislike) SetActivityStreamsUrl(i vocab.ActivityStream
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsDislike) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsDislike) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsDislike) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsDislike) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_document/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_document/gen_pkg.go
index d4145b6f6..343a63d1b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_document/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_document/gen_pkg.go
@@ -136,22 +136,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_document/gen_type_activitystreams_document.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_document/gen_type_activitystreams_document.go
index 9663fae73..49c4e73e5 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_document/gen_type_activitystreams_document.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_document/gen_type_activitystreams_document.go
@@ -48,10 +48,7 @@ type ActivityStreamsDocument struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -263,26 +260,11 @@ func DeserializeDocument(m map[string]interface{}, aliasMap map[string]string) (
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -371,14 +353,8 @@ func DeserializeDocument(m map[string]interface{}, aliasMap map[string]string) (
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -397,7 +373,7 @@ func DeserializeDocument(m map[string]interface{}, aliasMap map[string]string) (
 // DocumentIsDisjointWith returns true if the other provided type is disjoint with
 // the Document type.
 func DocumentIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -629,23 +605,6 @@ func (this ActivityStreamsDocument) GetActivityStreamsUrl() vocab.ActivityStream
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsDocument) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsDocument) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsDocument) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsDocument) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -717,10 +676,7 @@ func (this ActivityStreamsDocument) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1166,34 +1122,6 @@ func (this ActivityStreamsDocument) LessThan(o vocab.ActivityStreamsDocument) bo
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1208,20 +1136,6 @@ func (this ActivityStreamsDocument) LessThan(o vocab.ActivityStreamsDocument) bo
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1535,22 +1449,6 @@ func (this ActivityStreamsDocument) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1559,14 +1457,6 @@ func (this ActivityStreamsDocument) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1765,21 +1655,6 @@ func (this *ActivityStreamsDocument) SetActivityStreamsUrl(i vocab.ActivityStrea
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsDocument) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsDocument) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsDocument) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsDocument) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_event/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_event/gen_pkg.go
index d18688f53..429cfdb35 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_event/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_event/gen_pkg.go
@@ -132,22 +132,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_event/gen_type_activitystreams_event.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_event/gen_type_activitystreams_event.go
index e9fb7cd0f..cfe235998 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_event/gen_type_activitystreams_event.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_event/gen_type_activitystreams_event.go
@@ -48,10 +48,7 @@ type ActivityStreamsEvent struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -258,26 +255,11 @@ func DeserializeEvent(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -364,14 +346,8 @@ func DeserializeEvent(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -390,7 +366,7 @@ func DeserializeEvent(m map[string]interface{}, aliasMap map[string]string) (*Ac
 // EventIsDisjointWith returns true if the other provided type is disjoint with
 // the Event type.
 func EventIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -617,23 +593,6 @@ func (this ActivityStreamsEvent) GetActivityStreamsUrl() vocab.ActivityStreamsUr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsEvent) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsEvent) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsEvent) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsEvent) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -699,10 +658,7 @@ func (this ActivityStreamsEvent) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1134,34 +1090,6 @@ func (this ActivityStreamsEvent) LessThan(o vocab.ActivityStreamsEvent) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1176,20 +1104,6 @@ func (this ActivityStreamsEvent) LessThan(o vocab.ActivityStreamsEvent) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1495,22 +1409,6 @@ func (this ActivityStreamsEvent) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1519,14 +1417,6 @@ func (this ActivityStreamsEvent) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1725,21 +1615,6 @@ func (this *ActivityStreamsEvent) SetActivityStreamsUrl(i vocab.ActivityStreamsU
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsEvent) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsEvent) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsEvent) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsEvent) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_flag/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_flag/gen_pkg.go
index 094b751f4..d5aea7bb3 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_flag/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_flag/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_flag/gen_type_activitystreams_flag.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_flag/gen_type_activitystreams_flag.go
index fe55a0f3f..c9925b3a3 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_flag/gen_type_activitystreams_flag.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_flag/gen_type_activitystreams_flag.go
@@ -58,10 +58,7 @@ type ActivityStreamsFlag struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -293,26 +290,11 @@ func DeserializeFlag(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -409,14 +391,8 @@ func DeserializeFlag(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -435,7 +411,7 @@ func DeserializeFlag(m map[string]interface{}, aliasMap map[string]string) (*Act
 // FlagIsDisjointWith returns true if the other provided type is disjoint with the
 // Flag type.
 func FlagIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -692,23 +668,6 @@ func (this ActivityStreamsFlag) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsFlag) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsFlag) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsFlag) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsFlag) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -779,10 +738,7 @@ func (this ActivityStreamsFlag) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1284,34 +1240,6 @@ func (this ActivityStreamsFlag) LessThan(o vocab.ActivityStreamsFlag) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1326,20 +1254,6 @@ func (this ActivityStreamsFlag) LessThan(o vocab.ActivityStreamsFlag) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1685,22 +1599,6 @@ func (this ActivityStreamsFlag) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1709,14 +1607,6 @@ func (this ActivityStreamsFlag) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1940,21 +1830,6 @@ func (this *ActivityStreamsFlag) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsFlag) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsFlag) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsFlag) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsFlag) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_follow/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_follow/gen_pkg.go
index c2aad58e8..851e82c28 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_follow/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_follow/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_follow/gen_type_activitystreams_follow.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_follow/gen_type_activitystreams_follow.go
index 3b454cbb9..a07578f41 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_follow/gen_type_activitystreams_follow.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_follow/gen_type_activitystreams_follow.go
@@ -62,10 +62,7 @@ type ActivityStreamsFollow struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -297,26 +294,11 @@ func DeserializeFollow(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -413,14 +395,8 @@ func DeserializeFollow(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -439,7 +415,7 @@ func DeserializeFollow(m map[string]interface{}, aliasMap map[string]string) (*A
 // FollowIsDisjointWith returns true if the other provided type is disjoint with
 // the Follow type.
 func FollowIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -696,23 +672,6 @@ func (this ActivityStreamsFollow) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsFollow) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsFollow) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsFollow) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsFollow) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -783,10 +742,7 @@ func (this ActivityStreamsFollow) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1288,34 +1244,6 @@ func (this ActivityStreamsFollow) LessThan(o vocab.ActivityStreamsFollow) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1330,20 +1258,6 @@ func (this ActivityStreamsFollow) LessThan(o vocab.ActivityStreamsFollow) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1689,22 +1603,6 @@ func (this ActivityStreamsFollow) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1713,14 +1611,6 @@ func (this ActivityStreamsFollow) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1944,21 +1834,6 @@ func (this *ActivityStreamsFollow) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsFollow) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsFollow) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsFollow) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsFollow) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_group/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_group/gen_pkg.go
index c0d74dc75..f9faf1487 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_group/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_group/gen_pkg.go
@@ -182,22 +182,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_group/gen_type_activitystreams_group.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_group/gen_type_activitystreams_group.go
index 6d5e238e2..c7443c15c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_group/gen_type_activitystreams_group.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_group/gen_type_activitystreams_group.go
@@ -58,10 +58,7 @@ type ActivityStreamsGroup struct {
 	ActivityStreamsStreams                   vocab.ActivityStreamsStreamsProperty
 	ActivityStreamsSummary                   vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag                       vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                             vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy                 vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo                        vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor                 vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                               vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated                   vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl                       vocab.ActivityStreamsUrlProperty
@@ -328,26 +325,11 @@ func DeserializeGroup(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -460,14 +442,8 @@ func DeserializeGroup(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -486,7 +462,7 @@ func DeserializeGroup(m map[string]interface{}, aliasMap map[string]string) (*Ac
 // GroupIsDisjointWith returns true if the other provided type is disjoint with
 // the Group type.
 func GroupIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -767,23 +743,6 @@ func (this ActivityStreamsGroup) GetActivityStreamsUrl() vocab.ActivityStreamsUr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsGroup) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsGroup) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsGroup) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsGroup) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -878,10 +837,7 @@ func (this ActivityStreamsGroup) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStreams, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1481,34 +1437,6 @@ func (this ActivityStreamsGroup) LessThan(o vocab.ActivityStreamsGroup) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1523,20 +1451,6 @@ func (this ActivityStreamsGroup) LessThan(o vocab.ActivityStreamsGroup) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1938,22 +1852,6 @@ func (this ActivityStreamsGroup) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1962,14 +1860,6 @@ func (this ActivityStreamsGroup) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -2214,21 +2104,6 @@ func (this *ActivityStreamsGroup) SetActivityStreamsUrl(i vocab.ActivityStreamsU
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsGroup) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsGroup) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsGroup) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsGroup) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_ignore/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_ignore/gen_pkg.go
index f29a762a4..9a3b44efa 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_ignore/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_ignore/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_ignore/gen_type_activitystreams_ignore.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_ignore/gen_type_activitystreams_ignore.go
index fe2dcf8ca..5c356be8d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_ignore/gen_type_activitystreams_ignore.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_ignore/gen_type_activitystreams_ignore.go
@@ -57,10 +57,7 @@ type ActivityStreamsIgnore struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -292,26 +289,11 @@ func DeserializeIgnore(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -408,14 +390,8 @@ func DeserializeIgnore(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -434,7 +410,7 @@ func DeserializeIgnore(m map[string]interface{}, aliasMap map[string]string) (*A
 // IgnoreIsDisjointWith returns true if the other provided type is disjoint with
 // the Ignore type.
 func IgnoreIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -696,23 +672,6 @@ func (this ActivityStreamsIgnore) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsIgnore) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsIgnore) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsIgnore) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsIgnore) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -783,10 +742,7 @@ func (this ActivityStreamsIgnore) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1288,34 +1244,6 @@ func (this ActivityStreamsIgnore) LessThan(o vocab.ActivityStreamsIgnore) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1330,20 +1258,6 @@ func (this ActivityStreamsIgnore) LessThan(o vocab.ActivityStreamsIgnore) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1689,22 +1603,6 @@ func (this ActivityStreamsIgnore) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1713,14 +1611,6 @@ func (this ActivityStreamsIgnore) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1944,21 +1834,6 @@ func (this *ActivityStreamsIgnore) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsIgnore) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsIgnore) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsIgnore) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsIgnore) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_image/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_image/gen_pkg.go
index 41290f925..cec5187db 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_image/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_image/gen_pkg.go
@@ -140,22 +140,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_image/gen_type_activitystreams_image.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_image/gen_type_activitystreams_image.go
index 23f288f2f..1e6681301 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_image/gen_type_activitystreams_image.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_image/gen_type_activitystreams_image.go
@@ -60,10 +60,7 @@ type ActivityStreamsImage struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -281,26 +278,11 @@ func DeserializeImage(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -396,14 +378,8 @@ func DeserializeImage(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -424,7 +400,7 @@ func DeserializeImage(m map[string]interface{}, aliasMap map[string]string) (*Ac
 // ImageIsDisjointWith returns true if the other provided type is disjoint with
 // the Image type.
 func ImageIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -663,23 +639,6 @@ func (this ActivityStreamsImage) GetActivityStreamsWidth() vocab.ActivityStreams
 	return this.ActivityStreamsWidth
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsImage) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsImage) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsImage) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsImage) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -752,10 +711,7 @@ func (this ActivityStreamsImage) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1216,34 +1172,6 @@ func (this ActivityStreamsImage) LessThan(o vocab.ActivityStreamsImage) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1258,20 +1186,6 @@ func (this ActivityStreamsImage) LessThan(o vocab.ActivityStreamsImage) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1607,22 +1521,6 @@ func (this ActivityStreamsImage) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1631,14 +1529,6 @@ func (this ActivityStreamsImage) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1855,21 +1745,6 @@ func (this *ActivityStreamsImage) SetActivityStreamsWidth(i vocab.ActivityStream
 	this.ActivityStreamsWidth = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsImage) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsImage) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsImage) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsImage) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_intransitiveactivity/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_intransitiveactivity/gen_pkg.go
index ef5399316..1598c31ec 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_intransitiveactivity/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_intransitiveactivity/gen_pkg.go
@@ -148,22 +148,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_intransitiveactivity/gen_type_activitystreams_intransitiveactivity.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_intransitiveactivity/gen_type_activitystreams_intransitiveactivity.go
index 295d0b154..705d26ca0 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_intransitiveactivity/gen_type_activitystreams_intransitiveactivity.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_intransitiveactivity/gen_type_activitystreams_intransitiveactivity.go
@@ -60,10 +60,7 @@ type ActivityStreamsIntransitiveActivity struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -290,26 +287,11 @@ func DeserializeIntransitiveActivity(m map[string]interface{}, aliasMap map[stri
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -404,14 +386,8 @@ func DeserializeIntransitiveActivity(m map[string]interface{}, aliasMap map[stri
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -430,7 +406,7 @@ func DeserializeIntransitiveActivity(m map[string]interface{}, aliasMap map[stri
 // IntransitiveActivityIsDisjointWith returns true if the other provided type is
 // disjoint with the IntransitiveActivity type.
 func IntransitiveActivityIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -687,23 +663,6 @@ func (this ActivityStreamsIntransitiveActivity) GetActivityStreamsUrl() vocab.Ac
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsIntransitiveActivity) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsIntransitiveActivity) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsIntransitiveActivity) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsIntransitiveActivity) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -775,10 +734,7 @@ func (this ActivityStreamsIntransitiveActivity) JSONLDContext() map[string]strin
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1266,34 +1222,6 @@ func (this ActivityStreamsIntransitiveActivity) LessThan(o vocab.ActivityStreams
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1308,20 +1236,6 @@ func (this ActivityStreamsIntransitiveActivity) LessThan(o vocab.ActivityStreams
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1659,22 +1573,6 @@ func (this ActivityStreamsIntransitiveActivity) Serialize() (map[string]interfac
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1683,14 +1581,6 @@ func (this ActivityStreamsIntransitiveActivity) Serialize() (map[string]interfac
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1909,21 +1799,6 @@ func (this *ActivityStreamsIntransitiveActivity) SetActivityStreamsUrl(i vocab.A
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsIntransitiveActivity) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsIntransitiveActivity) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsIntransitiveActivity) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsIntransitiveActivity) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_invite/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_invite/gen_pkg.go
index 4a2112007..e45c9b162 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_invite/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_invite/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_invite/gen_type_activitystreams_invite.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_invite/gen_type_activitystreams_invite.go
index 44ec6d8cb..9d34e8612 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_invite/gen_type_activitystreams_invite.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_invite/gen_type_activitystreams_invite.go
@@ -70,10 +70,7 @@ type ActivityStreamsInvite struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -305,26 +302,11 @@ func DeserializeInvite(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -421,14 +403,8 @@ func DeserializeInvite(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -447,7 +423,7 @@ func DeserializeInvite(m map[string]interface{}, aliasMap map[string]string) (*A
 // InviteIsDisjointWith returns true if the other provided type is disjoint with
 // the Invite type.
 func InviteIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -704,23 +680,6 @@ func (this ActivityStreamsInvite) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsInvite) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsInvite) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsInvite) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsInvite) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -791,10 +750,7 @@ func (this ActivityStreamsInvite) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1296,34 +1252,6 @@ func (this ActivityStreamsInvite) LessThan(o vocab.ActivityStreamsInvite) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1338,20 +1266,6 @@ func (this ActivityStreamsInvite) LessThan(o vocab.ActivityStreamsInvite) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1697,22 +1611,6 @@ func (this ActivityStreamsInvite) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1721,14 +1619,6 @@ func (this ActivityStreamsInvite) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1952,21 +1842,6 @@ func (this *ActivityStreamsInvite) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsInvite) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsInvite) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsInvite) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsInvite) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_join/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_join/gen_pkg.go
index 1c0160c5e..3fccc3cf4 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_join/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_join/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_join/gen_type_activitystreams_join.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_join/gen_type_activitystreams_join.go
index a18abeb84..4e4be1617 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_join/gen_type_activitystreams_join.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_join/gen_type_activitystreams_join.go
@@ -60,10 +60,7 @@ type ActivityStreamsJoin struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -295,26 +292,11 @@ func DeserializeJoin(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -411,14 +393,8 @@ func DeserializeJoin(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -446,7 +422,7 @@ func IsOrExtendsJoin(other vocab.Type) bool {
 // JoinIsDisjointWith returns true if the other provided type is disjoint with the
 // Join type.
 func JoinIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -694,23 +670,6 @@ func (this ActivityStreamsJoin) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsJoin) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsJoin) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsJoin) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsJoin) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -781,10 +740,7 @@ func (this ActivityStreamsJoin) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1286,34 +1242,6 @@ func (this ActivityStreamsJoin) LessThan(o vocab.ActivityStreamsJoin) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1328,20 +1256,6 @@ func (this ActivityStreamsJoin) LessThan(o vocab.ActivityStreamsJoin) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1687,22 +1601,6 @@ func (this ActivityStreamsJoin) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1711,14 +1609,6 @@ func (this ActivityStreamsJoin) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1942,21 +1832,6 @@ func (this *ActivityStreamsJoin) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsJoin) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsJoin) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsJoin) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsJoin) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_leave/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_leave/gen_pkg.go
index 59e6cf13e..258a3d68c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_leave/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_leave/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_leave/gen_type_activitystreams_leave.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_leave/gen_type_activitystreams_leave.go
index 70f2c4853..4e69e3a3d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_leave/gen_type_activitystreams_leave.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_leave/gen_type_activitystreams_leave.go
@@ -74,10 +74,7 @@ type ActivityStreamsLeave struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -309,26 +306,11 @@ func DeserializeLeave(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -425,14 +407,8 @@ func DeserializeLeave(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -460,7 +436,7 @@ func IsOrExtendsLeave(other vocab.Type) bool {
 // LeaveIsDisjointWith returns true if the other provided type is disjoint with
 // the Leave type.
 func LeaveIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -708,23 +684,6 @@ func (this ActivityStreamsLeave) GetActivityStreamsUrl() vocab.ActivityStreamsUr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsLeave) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsLeave) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsLeave) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsLeave) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -795,10 +754,7 @@ func (this ActivityStreamsLeave) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1300,34 +1256,6 @@ func (this ActivityStreamsLeave) LessThan(o vocab.ActivityStreamsLeave) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1342,20 +1270,6 @@ func (this ActivityStreamsLeave) LessThan(o vocab.ActivityStreamsLeave) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1701,22 +1615,6 @@ func (this ActivityStreamsLeave) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1725,14 +1623,6 @@ func (this ActivityStreamsLeave) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1956,21 +1846,6 @@ func (this *ActivityStreamsLeave) SetActivityStreamsUrl(i vocab.ActivityStreamsU
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsLeave) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsLeave) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsLeave) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsLeave) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_like/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_like/gen_pkg.go
index f91c9f206..2a49164f2 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_like/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_like/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_like/gen_type_activitystreams_like.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_like/gen_type_activitystreams_like.go
index 20fdca95b..9d7be09cc 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_like/gen_type_activitystreams_like.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_like/gen_type_activitystreams_like.go
@@ -57,10 +57,7 @@ type ActivityStreamsLike struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -292,26 +289,11 @@ func DeserializeLike(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -408,14 +390,8 @@ func DeserializeLike(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -443,7 +419,7 @@ func IsOrExtendsLike(other vocab.Type) bool {
 // LikeIsDisjointWith returns true if the other provided type is disjoint with the
 // Like type.
 func LikeIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -691,23 +667,6 @@ func (this ActivityStreamsLike) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsLike) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsLike) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsLike) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsLike) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -778,10 +737,7 @@ func (this ActivityStreamsLike) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1283,34 +1239,6 @@ func (this ActivityStreamsLike) LessThan(o vocab.ActivityStreamsLike) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1325,20 +1253,6 @@ func (this ActivityStreamsLike) LessThan(o vocab.ActivityStreamsLike) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1684,22 +1598,6 @@ func (this ActivityStreamsLike) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1708,14 +1606,6 @@ func (this ActivityStreamsLike) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1939,21 +1829,6 @@ func (this *ActivityStreamsLike) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsLike) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsLike) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsLike) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsLike) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_link/gen_type_activitystreams_link.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_link/gen_type_activitystreams_link.go
index a72bf4fe3..103c9b66d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_link/gen_type_activitystreams_link.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_link/gen_type_activitystreams_link.go
@@ -199,7 +199,7 @@ func IsOrExtendsLink(other vocab.Type) bool {
 // LinkIsDisjointWith returns true if the other provided type is disjoint with the
 // Link type.
 func LinkIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Accept", "Activity", "Add", "Announce", "Application", "Arrive", "Article", "Audio", "Block", "Branch", "Collection", "CollectionPage", "Commit", "Create", "Delete", "Dislike", "Document", "Emoji", "Event", "Flag", "Follow", "Group", "IdentityProof", "Ignore", "Image", "IntransitiveActivity", "Invite", "Join", "Leave", "Like", "Listen", "Move", "Note", "Object", "Offer", "OrderedCollection", "OrderedCollectionPage", "OrderedCollectionPage", "Organization", "Page", "Person", "Place", "Profile", "PropertyValue", "Push", "Question", "Read", "Reject", "Relationship", "Remove", "Repository", "Service", "TentativeAccept", "TentativeReject", "Ticket", "TicketDependency", "Tombstone", "Travel", "Undo", "Update", "Video", "View"}
+	disjointWith := []string{"Accept", "Activity", "Add", "Announce", "Application", "Arrive", "Article", "Audio", "Block", "Collection", "CollectionPage", "Create", "Delete", "Dislike", "Document", "Emoji", "Event", "Flag", "Follow", "Group", "IdentityProof", "Ignore", "Image", "IntransitiveActivity", "Invite", "Join", "Leave", "Like", "Listen", "Move", "Note", "Object", "Offer", "OrderedCollection", "OrderedCollectionPage", "OrderedCollectionPage", "Organization", "Page", "Person", "Place", "Profile", "PropertyValue", "Question", "Read", "Reject", "Relationship", "Remove", "Service", "TentativeAccept", "TentativeReject", "Tombstone", "Travel", "Undo", "Update", "Video", "View"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -212,7 +212,7 @@ func LinkIsDisjointWith(other vocab.Type) bool {
 // type. Note that it returns false if the types are the same; see the
 // "IsOrExtendsLink" variant instead.
 func LinkIsExtendedBy(other vocab.Type) bool {
-	extensions := []string{"Mention"}
+	extensions := []string{"Hashtag", "Mention"}
 	for _, ext := range extensions {
 		if ext == other.GetTypeName() {
 			return true
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_listen/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_listen/gen_pkg.go
index 5b4c0c591..3a7e6bb19 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_listen/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_listen/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_listen/gen_type_activitystreams_listen.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_listen/gen_type_activitystreams_listen.go
index bc5deaea0..83433d008 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_listen/gen_type_activitystreams_listen.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_listen/gen_type_activitystreams_listen.go
@@ -56,10 +56,7 @@ type ActivityStreamsListen struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -291,26 +288,11 @@ func DeserializeListen(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -407,14 +389,8 @@ func DeserializeListen(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -442,7 +418,7 @@ func IsOrExtendsListen(other vocab.Type) bool {
 // ListenIsDisjointWith returns true if the other provided type is disjoint with
 // the Listen type.
 func ListenIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -690,23 +666,6 @@ func (this ActivityStreamsListen) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsListen) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsListen) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsListen) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsListen) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -777,10 +736,7 @@ func (this ActivityStreamsListen) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1282,34 +1238,6 @@ func (this ActivityStreamsListen) LessThan(o vocab.ActivityStreamsListen) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1324,20 +1252,6 @@ func (this ActivityStreamsListen) LessThan(o vocab.ActivityStreamsListen) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1683,22 +1597,6 @@ func (this ActivityStreamsListen) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1707,14 +1605,6 @@ func (this ActivityStreamsListen) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1938,21 +1828,6 @@ func (this *ActivityStreamsListen) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsListen) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsListen) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsListen) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsListen) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_mention/gen_type_activitystreams_mention.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_mention/gen_type_activitystreams_mention.go
index 40b8b2bed..351d8511b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_mention/gen_type_activitystreams_mention.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_mention/gen_type_activitystreams_mention.go
@@ -197,7 +197,7 @@ func IsOrExtendsMention(other vocab.Type) bool {
 // MentionIsDisjointWith returns true if the other provided type is disjoint with
 // the Mention type.
 func MentionIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Accept", "Activity", "Add", "Announce", "Application", "Arrive", "Article", "Audio", "Block", "Branch", "Collection", "CollectionPage", "Commit", "Create", "Delete", "Dislike", "Document", "Emoji", "Event", "Flag", "Follow", "Group", "IdentityProof", "Ignore", "Image", "IntransitiveActivity", "Invite", "Join", "Leave", "Like", "Listen", "Move", "Note", "Object", "Offer", "OrderedCollection", "OrderedCollectionPage", "OrderedCollectionPage", "Organization", "Page", "Person", "Place", "Profile", "PropertyValue", "Push", "Question", "Read", "Reject", "Relationship", "Remove", "Repository", "Service", "TentativeAccept", "TentativeReject", "Ticket", "TicketDependency", "Tombstone", "Travel", "Undo", "Update", "Video", "View"}
+	disjointWith := []string{"Accept", "Activity", "Add", "Announce", "Application", "Arrive", "Article", "Audio", "Block", "Collection", "CollectionPage", "Create", "Delete", "Dislike", "Document", "Emoji", "Event", "Flag", "Follow", "Group", "IdentityProof", "Ignore", "Image", "IntransitiveActivity", "Invite", "Join", "Leave", "Like", "Listen", "Move", "Note", "Object", "Offer", "OrderedCollection", "OrderedCollectionPage", "OrderedCollectionPage", "Organization", "Page", "Person", "Place", "Profile", "PropertyValue", "Question", "Read", "Reject", "Relationship", "Remove", "Service", "TentativeAccept", "TentativeReject", "Tombstone", "Travel", "Undo", "Update", "Video", "View"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_move/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_move/gen_pkg.go
index 23e6af928..3033ac83c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_move/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_move/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_move/gen_type_activitystreams_move.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_move/gen_type_activitystreams_move.go
index b4eabcd61..690bba591 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_move/gen_type_activitystreams_move.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_move/gen_type_activitystreams_move.go
@@ -65,10 +65,7 @@ type ActivityStreamsMove struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -300,26 +297,11 @@ func DeserializeMove(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -416,14 +398,8 @@ func DeserializeMove(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -451,7 +427,7 @@ func IsOrExtendsMove(other vocab.Type) bool {
 // MoveIsDisjointWith returns true if the other provided type is disjoint with the
 // Move type.
 func MoveIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -699,23 +675,6 @@ func (this ActivityStreamsMove) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsMove) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsMove) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsMove) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsMove) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -786,10 +745,7 @@ func (this ActivityStreamsMove) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1291,34 +1247,6 @@ func (this ActivityStreamsMove) LessThan(o vocab.ActivityStreamsMove) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1333,20 +1261,6 @@ func (this ActivityStreamsMove) LessThan(o vocab.ActivityStreamsMove) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1692,22 +1606,6 @@ func (this ActivityStreamsMove) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1716,14 +1614,6 @@ func (this ActivityStreamsMove) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1947,21 +1837,6 @@ func (this *ActivityStreamsMove) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsMove) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsMove) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsMove) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsMove) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_note/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_note/gen_pkg.go
index 111302ed4..d3088c3c5 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_note/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_note/gen_pkg.go
@@ -132,22 +132,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_note/gen_type_activitystreams_note.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_note/gen_type_activitystreams_note.go
index 36a0807b9..6ac8034de 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_note/gen_type_activitystreams_note.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_note/gen_type_activitystreams_note.go
@@ -48,10 +48,7 @@ type ActivityStreamsNote struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -258,26 +255,11 @@ func DeserializeNote(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -364,14 +346,8 @@ func DeserializeNote(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -410,7 +386,7 @@ func NewActivityStreamsNote() *ActivityStreamsNote {
 // NoteIsDisjointWith returns true if the other provided type is disjoint with the
 // Note type.
 func NoteIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -617,23 +593,6 @@ func (this ActivityStreamsNote) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsNote) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsNote) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsNote) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsNote) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -699,10 +658,7 @@ func (this ActivityStreamsNote) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1134,34 +1090,6 @@ func (this ActivityStreamsNote) LessThan(o vocab.ActivityStreamsNote) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1176,20 +1104,6 @@ func (this ActivityStreamsNote) LessThan(o vocab.ActivityStreamsNote) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1495,22 +1409,6 @@ func (this ActivityStreamsNote) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1519,14 +1417,6 @@ func (this ActivityStreamsNote) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1725,21 +1615,6 @@ func (this *ActivityStreamsNote) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsNote) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsNote) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsNote) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsNote) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_object/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_object/gen_pkg.go
index 0f1aeccf1..f7826b4c5 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_object/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_object/gen_pkg.go
@@ -132,22 +132,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_object/gen_type_activitystreams_object.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_object/gen_type_activitystreams_object.go
index 84b753d29..b03c6a3b3 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_object/gen_type_activitystreams_object.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_object/gen_type_activitystreams_object.go
@@ -50,10 +50,7 @@ type ActivityStreamsObject struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -255,26 +252,11 @@ func DeserializeObject(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -361,14 +343,8 @@ func DeserializeObject(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -407,7 +383,7 @@ func NewActivityStreamsObject() *ActivityStreamsObject {
 // ObjectIsDisjointWith returns true if the other provided type is disjoint with
 // the Object type.
 func ObjectIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -420,7 +396,7 @@ func ObjectIsDisjointWith(other vocab.Type) bool {
 // Object type. Note that it returns false if the types are the same; see the
 // "IsOrExtendsObject" variant instead.
 func ObjectIsExtendedBy(other vocab.Type) bool {
-	extensions := []string{"Accept", "Activity", "Add", "Announce", "Application", "Arrive", "Article", "Audio", "Block", "Branch", "Collection", "CollectionPage", "Commit", "Create", "Delete", "Dislike", "Document", "Emoji", "Event", "Flag", "Follow", "Group", "IdentityProof", "Ignore", "Image", "IntransitiveActivity", "Invite", "Join", "Leave", "Like", "Listen", "Move", "Note", "Offer", "OrderedCollection", "OrderedCollectionPage", "OrderedCollectionPage", "Organization", "Page", "Person", "Place", "Profile", "PropertyValue", "Push", "Question", "Read", "Reject", "Relationship", "Remove", "Repository", "Service", "TentativeAccept", "TentativeReject", "Ticket", "TicketDependency", "Tombstone", "Travel", "Undo", "Update", "Video", "View"}
+	extensions := []string{"Accept", "Activity", "Add", "Announce", "Application", "Arrive", "Article", "Audio", "Block", "Collection", "CollectionPage", "Create", "Delete", "Dislike", "Document", "Emoji", "Event", "Flag", "Follow", "Group", "IdentityProof", "Ignore", "Image", "IntransitiveActivity", "Invite", "Join", "Leave", "Like", "Listen", "Move", "Note", "Offer", "OrderedCollection", "OrderedCollectionPage", "OrderedCollectionPage", "Organization", "Page", "Person", "Place", "Profile", "PropertyValue", "Question", "Read", "Reject", "Relationship", "Remove", "Service", "TentativeAccept", "TentativeReject", "Tombstone", "Travel", "Undo", "Update", "Video", "View"}
 	for _, ext := range extensions {
 		if ext == other.GetTypeName() {
 			return true
@@ -619,23 +595,6 @@ func (this ActivityStreamsObject) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsObject) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsObject) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsObject) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsObject) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -701,10 +660,7 @@ func (this ActivityStreamsObject) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1136,34 +1092,6 @@ func (this ActivityStreamsObject) LessThan(o vocab.ActivityStreamsObject) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1178,20 +1106,6 @@ func (this ActivityStreamsObject) LessThan(o vocab.ActivityStreamsObject) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1497,22 +1411,6 @@ func (this ActivityStreamsObject) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1521,14 +1419,6 @@ func (this ActivityStreamsObject) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1727,21 +1617,6 @@ func (this *ActivityStreamsObject) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsObject) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsObject) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsObject) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsObject) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_offer/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_offer/gen_pkg.go
index 7017c8fd9..f45bbe74e 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_offer/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_offer/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_offer/gen_type_activitystreams_offer.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_offer/gen_type_activitystreams_offer.go
index d4b0d7934..a3d4aa087 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_offer/gen_type_activitystreams_offer.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_offer/gen_type_activitystreams_offer.go
@@ -64,10 +64,7 @@ type ActivityStreamsOffer struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -299,26 +296,11 @@ func DeserializeOffer(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -415,14 +397,8 @@ func DeserializeOffer(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -461,7 +437,7 @@ func NewActivityStreamsOffer() *ActivityStreamsOffer {
 // OfferIsDisjointWith returns true if the other provided type is disjoint with
 // the Offer type.
 func OfferIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -703,23 +679,6 @@ func (this ActivityStreamsOffer) GetActivityStreamsUrl() vocab.ActivityStreamsUr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsOffer) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsOffer) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsOffer) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsOffer) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -790,10 +749,7 @@ func (this ActivityStreamsOffer) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1295,34 +1251,6 @@ func (this ActivityStreamsOffer) LessThan(o vocab.ActivityStreamsOffer) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1337,20 +1265,6 @@ func (this ActivityStreamsOffer) LessThan(o vocab.ActivityStreamsOffer) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1696,22 +1610,6 @@ func (this ActivityStreamsOffer) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1720,14 +1618,6 @@ func (this ActivityStreamsOffer) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1951,21 +1841,6 @@ func (this *ActivityStreamsOffer) SetActivityStreamsUrl(i vocab.ActivityStreamsU
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsOffer) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsOffer) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsOffer) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsOffer) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollection/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollection/gen_pkg.go
index 4bee15b78..9c85c4b79 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollection/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollection/gen_pkg.go
@@ -56,10 +56,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsDurationProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeDurationPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsDurationProperty, error)
-	// DeserializeEarlyItemsPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedEarlyItemsProperty" non-functional property
-	// in the vocabulary "ForgeFed"
-	DeserializeEarlyItemsPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedEarlyItemsProperty, error)
 	// DeserializeEndTimePropertyActivityStreams returns the deserialization
 	// method for the "ActivityStreamsEndTimeProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
@@ -153,14 +149,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -169,10 +157,6 @@ type privateManager interface {
 	// deserialization method for the "ActivityStreamsTotalItemsProperty"
 	// non-functional property in the vocabulary "ActivityStreams"
 	DeserializeTotalItemsPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTotalItemsProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollection/gen_type_activitystreams_orderedcollection.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollection/gen_type_activitystreams_orderedcollection.go
index 5faa77f17..b362a050a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollection/gen_type_activitystreams_orderedcollection.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollection/gen_type_activitystreams_orderedcollection.go
@@ -39,7 +39,6 @@ type ActivityStreamsOrderedCollection struct {
 	ActivityStreamsContext      vocab.ActivityStreamsContextProperty
 	ActivityStreamsCurrent      vocab.ActivityStreamsCurrentProperty
 	ActivityStreamsDuration     vocab.ActivityStreamsDurationProperty
-	ForgeFedEarlyItems          vocab.ForgeFedEarlyItemsProperty
 	ActivityStreamsEndTime      vocab.ActivityStreamsEndTimeProperty
 	ActivityStreamsFirst        vocab.ActivityStreamsFirstProperty
 	ActivityStreamsGenerator    vocab.ActivityStreamsGeneratorProperty
@@ -63,11 +62,8 @@ type ActivityStreamsOrderedCollection struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
 	ActivityStreamsTotalItems   vocab.ActivityStreamsTotalItemsProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -179,11 +175,6 @@ func DeserializeOrderedCollection(m map[string]interface{}, aliasMap map[string]
 	} else if p != nil {
 		this.ActivityStreamsDuration = p
 	}
-	if p, err := mgr.DeserializeEarlyItemsPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedEarlyItems = p
-	}
 	if p, err := mgr.DeserializeEndTimePropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -299,16 +290,6 @@ func DeserializeOrderedCollection(m map[string]interface{}, aliasMap map[string]
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -319,11 +300,6 @@ func DeserializeOrderedCollection(m map[string]interface{}, aliasMap map[string]
 	} else if p != nil {
 		this.ActivityStreamsTotalItems = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -368,8 +344,6 @@ func DeserializeOrderedCollection(m map[string]interface{}, aliasMap map[string]
 			continue
 		} else if k == "duration" {
 			continue
-		} else if k == "earlyItems" {
-			continue
 		} else if k == "endTime" {
 			continue
 		} else if k == "first" {
@@ -420,16 +394,10 @@ func DeserializeOrderedCollection(m map[string]interface{}, aliasMap map[string]
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
 		} else if k == "totalItems" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -468,7 +436,7 @@ func NewActivityStreamsOrderedCollection() *ActivityStreamsOrderedCollection {
 // OrderedCollectionIsDisjointWith returns true if the other provided type is
 // disjoint with the OrderedCollection type.
 func OrderedCollectionIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -710,29 +678,6 @@ func (this ActivityStreamsOrderedCollection) GetActivityStreamsUrl() vocab.Activ
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedEarlyItems returns the "earlyItems" property if it exists, and nil
-// otherwise.
-func (this ActivityStreamsOrderedCollection) GetForgeFedEarlyItems() vocab.ForgeFedEarlyItemsProperty {
-	return this.ForgeFedEarlyItems
-}
-
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsOrderedCollection) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsOrderedCollection) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsOrderedCollection) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsOrderedCollection) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -780,7 +725,6 @@ func (this ActivityStreamsOrderedCollection) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsContext, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsCurrent, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsDuration, m)
-	m = this.helperJSONLDContext(this.ForgeFedEarlyItems, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsEndTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsFirst, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsGenerator, m)
@@ -804,11 +748,8 @@ func (this ActivityStreamsOrderedCollection) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTotalItems, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -974,20 +915,6 @@ func (this ActivityStreamsOrderedCollection) LessThan(o vocab.ActivityStreamsOrd
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "earlyItems"
-	if lhs, rhs := this.ForgeFedEarlyItems, o.GetForgeFedEarlyItems(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "endTime"
 	if lhs, rhs := this.ActivityStreamsEndTime, o.GetActivityStreamsEndTime(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1310,34 +1237,6 @@ func (this ActivityStreamsOrderedCollection) LessThan(o vocab.ActivityStreamsOrd
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1366,20 +1265,6 @@ func (this ActivityStreamsOrderedCollection) LessThan(o vocab.ActivityStreamsOrd
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1533,14 +1418,6 @@ func (this ActivityStreamsOrderedCollection) Serialize() (map[string]interface{}
 			m[this.ActivityStreamsDuration.Name()] = i
 		}
 	}
-	// Maybe serialize property "earlyItems"
-	if this.ForgeFedEarlyItems != nil {
-		if i, err := this.ForgeFedEarlyItems.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedEarlyItems.Name()] = i
-		}
-	}
 	// Maybe serialize property "endTime"
 	if this.ActivityStreamsEndTime != nil {
 		if i, err := this.ActivityStreamsEndTime.Serialize(); err != nil {
@@ -1725,22 +1602,6 @@ func (this ActivityStreamsOrderedCollection) Serialize() (map[string]interface{}
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1757,14 +1618,6 @@ func (this ActivityStreamsOrderedCollection) Serialize() (map[string]interface{}
 			m[this.ActivityStreamsTotalItems.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1988,26 +1841,6 @@ func (this *ActivityStreamsOrderedCollection) SetActivityStreamsUrl(i vocab.Acti
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedEarlyItems sets the "earlyItems" property.
-func (this *ActivityStreamsOrderedCollection) SetForgeFedEarlyItems(i vocab.ForgeFedEarlyItemsProperty) {
-	this.ForgeFedEarlyItems = i
-}
-
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsOrderedCollection) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsOrderedCollection) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsOrderedCollection) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsOrderedCollection) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollectionpage/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollectionpage/gen_pkg.go
index 1b8c7a88e..a2c4bf4fd 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollectionpage/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollectionpage/gen_pkg.go
@@ -56,10 +56,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsDurationProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeDurationPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsDurationProperty, error)
-	// DeserializeEarlyItemsPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedEarlyItemsProperty" non-functional property
-	// in the vocabulary "ForgeFed"
-	DeserializeEarlyItemsPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedEarlyItemsProperty, error)
 	// DeserializeEndTimePropertyActivityStreams returns the deserialization
 	// method for the "ActivityStreamsEndTimeProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
@@ -169,14 +165,6 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
@@ -185,10 +173,6 @@ type privateManager interface {
 	// deserialization method for the "ActivityStreamsTotalItemsProperty"
 	// non-functional property in the vocabulary "ActivityStreams"
 	DeserializeTotalItemsPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTotalItemsProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollectionpage/gen_type_activitystreams_orderedcollectionpage.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollectionpage/gen_type_activitystreams_orderedcollectionpage.go
index 284c0da94..81fef4f75 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollectionpage/gen_type_activitystreams_orderedcollectionpage.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_orderedcollectionpage/gen_type_activitystreams_orderedcollectionpage.go
@@ -41,7 +41,6 @@ type ActivityStreamsOrderedCollectionPage struct {
 	ActivityStreamsContext      vocab.ActivityStreamsContextProperty
 	ActivityStreamsCurrent      vocab.ActivityStreamsCurrentProperty
 	ActivityStreamsDuration     vocab.ActivityStreamsDurationProperty
-	ForgeFedEarlyItems          vocab.ForgeFedEarlyItemsProperty
 	ActivityStreamsEndTime      vocab.ActivityStreamsEndTimeProperty
 	ActivityStreamsFirst        vocab.ActivityStreamsFirstProperty
 	ActivityStreamsGenerator    vocab.ActivityStreamsGeneratorProperty
@@ -69,11 +68,8 @@ type ActivityStreamsOrderedCollectionPage struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
 	ActivityStreamsTotalItems   vocab.ActivityStreamsTotalItemsProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -185,11 +181,6 @@ func DeserializeOrderedCollectionPage(m map[string]interface{}, aliasMap map[str
 	} else if p != nil {
 		this.ActivityStreamsDuration = p
 	}
-	if p, err := mgr.DeserializeEarlyItemsPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedEarlyItems = p
-	}
 	if p, err := mgr.DeserializeEndTimePropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -325,16 +316,6 @@ func DeserializeOrderedCollectionPage(m map[string]interface{}, aliasMap map[str
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -345,11 +326,6 @@ func DeserializeOrderedCollectionPage(m map[string]interface{}, aliasMap map[str
 	} else if p != nil {
 		this.ActivityStreamsTotalItems = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -394,8 +370,6 @@ func DeserializeOrderedCollectionPage(m map[string]interface{}, aliasMap map[str
 			continue
 		} else if k == "duration" {
 			continue
-		} else if k == "earlyItems" {
-			continue
 		} else if k == "endTime" {
 			continue
 		} else if k == "first" {
@@ -454,16 +428,10 @@ func DeserializeOrderedCollectionPage(m map[string]interface{}, aliasMap map[str
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
 		} else if k == "totalItems" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -502,7 +470,7 @@ func NewActivityStreamsOrderedCollectionPage() *ActivityStreamsOrderedCollection
 // OrderedCollectionPageIsDisjointWith returns true if the other provided type is
 // disjoint with the OrderedCollectionPage type.
 func OrderedCollectionPageIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -764,29 +732,6 @@ func (this ActivityStreamsOrderedCollectionPage) GetActivityStreamsUrl() vocab.A
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedEarlyItems returns the "earlyItems" property if it exists, and nil
-// otherwise.
-func (this ActivityStreamsOrderedCollectionPage) GetForgeFedEarlyItems() vocab.ForgeFedEarlyItemsProperty {
-	return this.ForgeFedEarlyItems
-}
-
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsOrderedCollectionPage) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsOrderedCollectionPage) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsOrderedCollectionPage) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsOrderedCollectionPage) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -835,7 +780,6 @@ func (this ActivityStreamsOrderedCollectionPage) JSONLDContext() map[string]stri
 	m = this.helperJSONLDContext(this.ActivityStreamsContext, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsCurrent, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsDuration, m)
-	m = this.helperJSONLDContext(this.ForgeFedEarlyItems, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsEndTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsFirst, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsGenerator, m)
@@ -863,11 +807,8 @@ func (this ActivityStreamsOrderedCollectionPage) JSONLDContext() map[string]stri
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTotalItems, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1033,20 +974,6 @@ func (this ActivityStreamsOrderedCollectionPage) LessThan(o vocab.ActivityStream
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "earlyItems"
-	if lhs, rhs := this.ForgeFedEarlyItems, o.GetForgeFedEarlyItems(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "endTime"
 	if lhs, rhs := this.ActivityStreamsEndTime, o.GetActivityStreamsEndTime(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1425,34 +1352,6 @@ func (this ActivityStreamsOrderedCollectionPage) LessThan(o vocab.ActivityStream
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1481,20 +1380,6 @@ func (this ActivityStreamsOrderedCollectionPage) LessThan(o vocab.ActivityStream
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1648,14 +1533,6 @@ func (this ActivityStreamsOrderedCollectionPage) Serialize() (map[string]interfa
 			m[this.ActivityStreamsDuration.Name()] = i
 		}
 	}
-	// Maybe serialize property "earlyItems"
-	if this.ForgeFedEarlyItems != nil {
-		if i, err := this.ForgeFedEarlyItems.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedEarlyItems.Name()] = i
-		}
-	}
 	// Maybe serialize property "endTime"
 	if this.ActivityStreamsEndTime != nil {
 		if i, err := this.ActivityStreamsEndTime.Serialize(); err != nil {
@@ -1872,22 +1749,6 @@ func (this ActivityStreamsOrderedCollectionPage) Serialize() (map[string]interfa
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1904,14 +1765,6 @@ func (this ActivityStreamsOrderedCollectionPage) Serialize() (map[string]interfa
 			m[this.ActivityStreamsTotalItems.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -2155,26 +2008,6 @@ func (this *ActivityStreamsOrderedCollectionPage) SetActivityStreamsUrl(i vocab.
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedEarlyItems sets the "earlyItems" property.
-func (this *ActivityStreamsOrderedCollectionPage) SetForgeFedEarlyItems(i vocab.ForgeFedEarlyItemsProperty) {
-	this.ForgeFedEarlyItems = i
-}
-
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsOrderedCollectionPage) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsOrderedCollectionPage) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsOrderedCollectionPage) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsOrderedCollectionPage) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_organization/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_organization/gen_pkg.go
index d0ec9f555..18c100aac 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_organization/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_organization/gen_pkg.go
@@ -182,22 +182,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_organization/gen_type_activitystreams_organization.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_organization/gen_type_activitystreams_organization.go
index f2e05c0af..e7687b4d0 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_organization/gen_type_activitystreams_organization.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_organization/gen_type_activitystreams_organization.go
@@ -58,10 +58,7 @@ type ActivityStreamsOrganization struct {
 	ActivityStreamsStreams                   vocab.ActivityStreamsStreamsProperty
 	ActivityStreamsSummary                   vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag                       vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                             vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy                 vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo                        vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor                 vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                               vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated                   vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl                       vocab.ActivityStreamsUrlProperty
@@ -328,26 +325,11 @@ func DeserializeOrganization(m map[string]interface{}, aliasMap map[string]strin
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -460,14 +442,8 @@ func DeserializeOrganization(m map[string]interface{}, aliasMap map[string]strin
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -506,7 +482,7 @@ func NewActivityStreamsOrganization() *ActivityStreamsOrganization {
 // OrganizationIsDisjointWith returns true if the other provided type is disjoint
 // with the Organization type.
 func OrganizationIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -767,23 +743,6 @@ func (this ActivityStreamsOrganization) GetActivityStreamsUrl() vocab.ActivitySt
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsOrganization) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsOrganization) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsOrganization) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsOrganization) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -878,10 +837,7 @@ func (this ActivityStreamsOrganization) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStreams, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1481,34 +1437,6 @@ func (this ActivityStreamsOrganization) LessThan(o vocab.ActivityStreamsOrganiza
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1523,20 +1451,6 @@ func (this ActivityStreamsOrganization) LessThan(o vocab.ActivityStreamsOrganiza
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1938,22 +1852,6 @@ func (this ActivityStreamsOrganization) Serialize() (map[string]interface{}, err
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1962,14 +1860,6 @@ func (this ActivityStreamsOrganization) Serialize() (map[string]interface{}, err
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -2214,21 +2104,6 @@ func (this *ActivityStreamsOrganization) SetActivityStreamsUrl(i vocab.ActivityS
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsOrganization) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsOrganization) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsOrganization) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsOrganization) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_page/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_page/gen_pkg.go
index 095c5a94a..eadfad1e5 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_page/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_page/gen_pkg.go
@@ -136,22 +136,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_page/gen_type_activitystreams_page.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_page/gen_type_activitystreams_page.go
index 51f124620..cd01b3c2b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_page/gen_type_activitystreams_page.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_page/gen_type_activitystreams_page.go
@@ -48,10 +48,7 @@ type ActivityStreamsPage struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -263,26 +260,11 @@ func DeserializePage(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -371,14 +353,8 @@ func DeserializePage(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -417,7 +393,7 @@ func NewActivityStreamsPage() *ActivityStreamsPage {
 // PageIsDisjointWith returns true if the other provided type is disjoint with the
 // Page type.
 func PageIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -624,23 +600,6 @@ func (this ActivityStreamsPage) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsPage) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsPage) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsPage) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsPage) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -712,10 +671,7 @@ func (this ActivityStreamsPage) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1161,34 +1117,6 @@ func (this ActivityStreamsPage) LessThan(o vocab.ActivityStreamsPage) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1203,20 +1131,6 @@ func (this ActivityStreamsPage) LessThan(o vocab.ActivityStreamsPage) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1530,22 +1444,6 @@ func (this ActivityStreamsPage) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1554,14 +1452,6 @@ func (this ActivityStreamsPage) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1760,21 +1650,6 @@ func (this *ActivityStreamsPage) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsPage) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsPage) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsPage) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsPage) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_person/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_person/gen_pkg.go
index 4959d08be..3d727c3b9 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_person/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_person/gen_pkg.go
@@ -182,22 +182,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_person/gen_type_activitystreams_person.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_person/gen_type_activitystreams_person.go
index 1f7e53125..f95ad0778 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_person/gen_type_activitystreams_person.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_person/gen_type_activitystreams_person.go
@@ -58,10 +58,7 @@ type ActivityStreamsPerson struct {
 	ActivityStreamsStreams                   vocab.ActivityStreamsStreamsProperty
 	ActivityStreamsSummary                   vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag                       vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                             vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy                 vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo                        vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor                 vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                               vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated                   vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl                       vocab.ActivityStreamsUrlProperty
@@ -328,26 +325,11 @@ func DeserializePerson(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -460,14 +442,8 @@ func DeserializePerson(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -506,7 +482,7 @@ func NewActivityStreamsPerson() *ActivityStreamsPerson {
 // PersonIsDisjointWith returns true if the other provided type is disjoint with
 // the Person type.
 func PersonIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -767,23 +743,6 @@ func (this ActivityStreamsPerson) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsPerson) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsPerson) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsPerson) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsPerson) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -878,10 +837,7 @@ func (this ActivityStreamsPerson) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStreams, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1481,34 +1437,6 @@ func (this ActivityStreamsPerson) LessThan(o vocab.ActivityStreamsPerson) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1523,20 +1451,6 @@ func (this ActivityStreamsPerson) LessThan(o vocab.ActivityStreamsPerson) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1938,22 +1852,6 @@ func (this ActivityStreamsPerson) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1962,14 +1860,6 @@ func (this ActivityStreamsPerson) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -2214,21 +2104,6 @@ func (this *ActivityStreamsPerson) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsPerson) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsPerson) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsPerson) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsPerson) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_place/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_place/gen_pkg.go
index 2947138fe..aa9a42b0d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_place/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_place/gen_pkg.go
@@ -148,22 +148,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_place/gen_type_activitystreams_place.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_place/gen_type_activitystreams_place.go
index 2d20c163d..90af537c8 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_place/gen_type_activitystreams_place.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_place/gen_type_activitystreams_place.go
@@ -61,10 +61,7 @@ type ActivityStreamsPlace struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUnits        vocab.ActivityStreamsUnitsProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
@@ -292,26 +289,11 @@ func DeserializePlace(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -411,14 +393,8 @@ func DeserializePlace(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "units" {
@@ -459,7 +435,7 @@ func NewActivityStreamsPlace() *ActivityStreamsPlace {
 // PlaceIsDisjointWith returns true if the other provided type is disjoint with
 // the Place type.
 func PlaceIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -696,23 +672,6 @@ func (this ActivityStreamsPlace) GetActivityStreamsUrl() vocab.ActivityStreamsUr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsPlace) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsPlace) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsPlace) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsPlace) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -782,10 +741,7 @@ func (this ActivityStreamsPlace) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUnits, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
@@ -1274,34 +1230,6 @@ func (this ActivityStreamsPlace) LessThan(o vocab.ActivityStreamsPlace) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1316,20 +1244,6 @@ func (this ActivityStreamsPlace) LessThan(o vocab.ActivityStreamsPlace) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1681,22 +1595,6 @@ func (this ActivityStreamsPlace) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1705,14 +1603,6 @@ func (this ActivityStreamsPlace) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1944,21 +1834,6 @@ func (this *ActivityStreamsPlace) SetActivityStreamsUrl(i vocab.ActivityStreamsU
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsPlace) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsPlace) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsPlace) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsPlace) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_profile/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_profile/gen_pkg.go
index d7c33f19f..4f9919840 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_profile/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_profile/gen_pkg.go
@@ -136,22 +136,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_profile/gen_type_activitystreams_profile.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_profile/gen_type_activitystreams_profile.go
index 81b32d9e2..fb216273b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_profile/gen_type_activitystreams_profile.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_profile/gen_type_activitystreams_profile.go
@@ -53,10 +53,7 @@ type ActivityStreamsProfile struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -268,26 +265,11 @@ func DeserializeProfile(m map[string]interface{}, aliasMap map[string]string) (*
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -376,14 +358,8 @@ func DeserializeProfile(m map[string]interface{}, aliasMap map[string]string) (*
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -422,7 +398,7 @@ func NewActivityStreamsProfile() *ActivityStreamsProfile {
 // ProfileIsDisjointWith returns true if the other provided type is disjoint with
 // the Profile type.
 func ProfileIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -635,23 +611,6 @@ func (this ActivityStreamsProfile) GetActivityStreamsUrl() vocab.ActivityStreams
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsProfile) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsProfile) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsProfile) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsProfile) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -718,10 +677,7 @@ func (this ActivityStreamsProfile) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1167,34 +1123,6 @@ func (this ActivityStreamsProfile) LessThan(o vocab.ActivityStreamsProfile) bool
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1209,20 +1137,6 @@ func (this ActivityStreamsProfile) LessThan(o vocab.ActivityStreamsProfile) bool
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1536,22 +1450,6 @@ func (this ActivityStreamsProfile) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1560,14 +1458,6 @@ func (this ActivityStreamsProfile) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1771,21 +1661,6 @@ func (this *ActivityStreamsProfile) SetActivityStreamsUrl(i vocab.ActivityStream
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsProfile) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsProfile) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsProfile) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsProfile) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_question/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_question/gen_pkg.go
index d72ee715e..032f7c697 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_question/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_question/gen_pkg.go
@@ -160,22 +160,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_question/gen_type_activitystreams_question.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_question/gen_type_activitystreams_question.go
index f956c69a4..8c5d6dab3 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_question/gen_type_activitystreams_question.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_question/gen_type_activitystreams_question.go
@@ -75,10 +75,7 @@ type ActivityStreamsQuestion struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -321,26 +318,11 @@ func DeserializeQuestion(m map[string]interface{}, aliasMap map[string]string) (
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -446,14 +428,8 @@ func DeserializeQuestion(m map[string]interface{}, aliasMap map[string]string) (
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -494,7 +470,7 @@ func NewActivityStreamsQuestion() *ActivityStreamsQuestion {
 // QuestionIsDisjointWith returns true if the other provided type is disjoint with
 // the Question type.
 func QuestionIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -743,23 +719,6 @@ func (this ActivityStreamsQuestion) GetActivityStreamsUrl() vocab.ActivityStream
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsQuestion) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsQuestion) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsQuestion) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsQuestion) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -838,10 +797,7 @@ func (this ActivityStreamsQuestion) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1372,34 +1328,6 @@ func (this ActivityStreamsQuestion) LessThan(o vocab.ActivityStreamsQuestion) bo
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1414,20 +1342,6 @@ func (this ActivityStreamsQuestion) LessThan(o vocab.ActivityStreamsQuestion) bo
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1803,22 +1717,6 @@ func (this ActivityStreamsQuestion) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1827,14 +1725,6 @@ func (this ActivityStreamsQuestion) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -2076,21 +1966,6 @@ func (this *ActivityStreamsQuestion) SetActivityStreamsUrl(i vocab.ActivityStrea
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsQuestion) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsQuestion) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsQuestion) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsQuestion) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_read/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_read/gen_pkg.go
index 69454ec01..e31f559cd 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_read/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_read/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_read/gen_type_activitystreams_read.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_read/gen_type_activitystreams_read.go
index bbe17b6de..9a89ca86b 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_read/gen_type_activitystreams_read.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_read/gen_type_activitystreams_read.go
@@ -56,10 +56,7 @@ type ActivityStreamsRead struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -291,26 +288,11 @@ func DeserializeRead(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -407,14 +389,8 @@ func DeserializeRead(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -453,7 +429,7 @@ func NewActivityStreamsRead() *ActivityStreamsRead {
 // ReadIsDisjointWith returns true if the other provided type is disjoint with the
 // Read type.
 func ReadIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -690,23 +666,6 @@ func (this ActivityStreamsRead) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsRead) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsRead) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsRead) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsRead) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -777,10 +736,7 @@ func (this ActivityStreamsRead) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1282,34 +1238,6 @@ func (this ActivityStreamsRead) LessThan(o vocab.ActivityStreamsRead) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1324,20 +1252,6 @@ func (this ActivityStreamsRead) LessThan(o vocab.ActivityStreamsRead) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1683,22 +1597,6 @@ func (this ActivityStreamsRead) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1707,14 +1605,6 @@ func (this ActivityStreamsRead) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1938,21 +1828,6 @@ func (this *ActivityStreamsRead) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsRead) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsRead) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsRead) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsRead) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_reject/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_reject/gen_pkg.go
index 5b84ebac8..39b41f8f0 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_reject/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_reject/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_reject/gen_type_activitystreams_reject.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_reject/gen_type_activitystreams_reject.go
index 7f7d0d287..3371c225e 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_reject/gen_type_activitystreams_reject.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_reject/gen_type_activitystreams_reject.go
@@ -64,10 +64,7 @@ type ActivityStreamsReject struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -299,26 +296,11 @@ func DeserializeReject(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -415,14 +397,8 @@ func DeserializeReject(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -461,7 +437,7 @@ func NewActivityStreamsReject() *ActivityStreamsReject {
 // RejectIsDisjointWith returns true if the other provided type is disjoint with
 // the Reject type.
 func RejectIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -703,23 +679,6 @@ func (this ActivityStreamsReject) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsReject) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsReject) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsReject) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsReject) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -790,10 +749,7 @@ func (this ActivityStreamsReject) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1295,34 +1251,6 @@ func (this ActivityStreamsReject) LessThan(o vocab.ActivityStreamsReject) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1337,20 +1265,6 @@ func (this ActivityStreamsReject) LessThan(o vocab.ActivityStreamsReject) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1696,22 +1610,6 @@ func (this ActivityStreamsReject) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1720,14 +1618,6 @@ func (this ActivityStreamsReject) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1951,21 +1841,6 @@ func (this *ActivityStreamsReject) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsReject) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsReject) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsReject) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsReject) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_relationship/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_relationship/gen_pkg.go
index 8fe76c6b4..1084b64ac 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_relationship/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_relationship/gen_pkg.go
@@ -141,22 +141,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_relationship/gen_type_activitystreams_relationship.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_relationship/gen_type_activitystreams_relationship.go
index f1675f19e..07c30a3f9 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_relationship/gen_type_activitystreams_relationship.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_relationship/gen_type_activitystreams_relationship.go
@@ -59,10 +59,7 @@ type ActivityStreamsRelationship struct {
 	ActivityStreamsSubject      vocab.ActivityStreamsSubjectProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -279,26 +276,11 @@ func DeserializeRelationship(m map[string]interface{}, aliasMap map[string]strin
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -389,14 +371,8 @@ func DeserializeRelationship(m map[string]interface{}, aliasMap map[string]strin
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -435,7 +411,7 @@ func NewActivityStreamsRelationship() *ActivityStreamsRelationship {
 // RelationshipIsDisjointWith returns true if the other provided type is disjoint
 // with the Relationship type.
 func RelationshipIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -448,12 +424,7 @@ func RelationshipIsDisjointWith(other vocab.Type) bool {
 // the Relationship type. Note that it returns false if the types are the
 // same; see the "IsOrExtendsRelationship" variant instead.
 func RelationshipIsExtendedBy(other vocab.Type) bool {
-	extensions := []string{"TicketDependency"}
-	for _, ext := range extensions {
-		if ext == other.GetTypeName() {
-			return true
-		}
-	}
+	// Shortcut implementation: is not extended by anything.
 	return false
 }
 
@@ -659,23 +630,6 @@ func (this ActivityStreamsRelationship) GetActivityStreamsUrl() vocab.ActivitySt
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsRelationship) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsRelationship) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsRelationship) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsRelationship) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -743,10 +697,7 @@ func (this ActivityStreamsRelationship) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSubject, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1206,34 +1157,6 @@ func (this ActivityStreamsRelationship) LessThan(o vocab.ActivityStreamsRelation
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1248,20 +1171,6 @@ func (this ActivityStreamsRelationship) LessThan(o vocab.ActivityStreamsRelation
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1583,22 +1492,6 @@ func (this ActivityStreamsRelationship) Serialize() (map[string]interface{}, err
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1607,14 +1500,6 @@ func (this ActivityStreamsRelationship) Serialize() (map[string]interface{}, err
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1823,21 +1708,6 @@ func (this *ActivityStreamsRelationship) SetActivityStreamsUrl(i vocab.ActivityS
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsRelationship) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsRelationship) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsRelationship) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsRelationship) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_remove/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_remove/gen_pkg.go
index 25bf641a6..ae5a9b67a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_remove/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_remove/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_remove/gen_type_activitystreams_remove.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_remove/gen_type_activitystreams_remove.go
index 33d194ff4..ff1da24c4 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_remove/gen_type_activitystreams_remove.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_remove/gen_type_activitystreams_remove.go
@@ -79,10 +79,7 @@ type ActivityStreamsRemove struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -314,26 +311,11 @@ func DeserializeRemove(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -430,14 +412,8 @@ func DeserializeRemove(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -476,7 +452,7 @@ func NewActivityStreamsRemove() *ActivityStreamsRemove {
 // RemoveIsDisjointWith returns true if the other provided type is disjoint with
 // the Remove type.
 func RemoveIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -713,23 +689,6 @@ func (this ActivityStreamsRemove) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsRemove) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsRemove) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsRemove) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsRemove) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -800,10 +759,7 @@ func (this ActivityStreamsRemove) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1305,34 +1261,6 @@ func (this ActivityStreamsRemove) LessThan(o vocab.ActivityStreamsRemove) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1347,20 +1275,6 @@ func (this ActivityStreamsRemove) LessThan(o vocab.ActivityStreamsRemove) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1706,22 +1620,6 @@ func (this ActivityStreamsRemove) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1730,14 +1628,6 @@ func (this ActivityStreamsRemove) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1961,21 +1851,6 @@ func (this *ActivityStreamsRemove) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsRemove) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsRemove) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsRemove) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsRemove) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_service/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_service/gen_pkg.go
index d8cf32260..65271e80f 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_service/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_service/gen_pkg.go
@@ -182,22 +182,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_service/gen_type_activitystreams_service.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_service/gen_type_activitystreams_service.go
index 6d7f0a3ca..b1a10f09c 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_service/gen_type_activitystreams_service.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_service/gen_type_activitystreams_service.go
@@ -58,10 +58,7 @@ type ActivityStreamsService struct {
 	ActivityStreamsStreams                   vocab.ActivityStreamsStreamsProperty
 	ActivityStreamsSummary                   vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag                       vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                             vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy                 vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo                        vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor                 vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                               vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated                   vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl                       vocab.ActivityStreamsUrlProperty
@@ -328,26 +325,11 @@ func DeserializeService(m map[string]interface{}, aliasMap map[string]string) (*
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -460,14 +442,8 @@ func DeserializeService(m map[string]interface{}, aliasMap map[string]string) (*
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -506,7 +482,7 @@ func NewActivityStreamsService() *ActivityStreamsService {
 // ServiceIsDisjointWith returns true if the other provided type is disjoint with
 // the Service type.
 func ServiceIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -767,23 +743,6 @@ func (this ActivityStreamsService) GetActivityStreamsUrl() vocab.ActivityStreams
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsService) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsService) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsService) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsService) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -878,10 +837,7 @@ func (this ActivityStreamsService) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStreams, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1481,34 +1437,6 @@ func (this ActivityStreamsService) LessThan(o vocab.ActivityStreamsService) bool
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1523,20 +1451,6 @@ func (this ActivityStreamsService) LessThan(o vocab.ActivityStreamsService) bool
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1938,22 +1852,6 @@ func (this ActivityStreamsService) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1962,14 +1860,6 @@ func (this ActivityStreamsService) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -2214,21 +2104,6 @@ func (this *ActivityStreamsService) SetActivityStreamsUrl(i vocab.ActivityStream
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsService) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsService) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsService) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsService) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativeaccept/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativeaccept/gen_pkg.go
index 6dde30a04..a50a1aecc 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativeaccept/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativeaccept/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativeaccept/gen_type_activitystreams_tentativeaccept.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativeaccept/gen_type_activitystreams_tentativeaccept.go
index b216f383e..b415994b1 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativeaccept/gen_type_activitystreams_tentativeaccept.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativeaccept/gen_type_activitystreams_tentativeaccept.go
@@ -63,10 +63,7 @@ type ActivityStreamsTentativeAccept struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -298,26 +295,11 @@ func DeserializeTentativeAccept(m map[string]interface{}, aliasMap map[string]st
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -414,14 +396,8 @@ func DeserializeTentativeAccept(m map[string]interface{}, aliasMap map[string]st
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -460,7 +436,7 @@ func NewActivityStreamsTentativeAccept() *ActivityStreamsTentativeAccept {
 // TentativeAcceptIsDisjointWith returns true if the other provided type is
 // disjoint with the TentativeAccept type.
 func TentativeAcceptIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -697,23 +673,6 @@ func (this ActivityStreamsTentativeAccept) GetActivityStreamsUrl() vocab.Activit
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsTentativeAccept) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsTentativeAccept) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsTentativeAccept) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsTentativeAccept) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -785,10 +744,7 @@ func (this ActivityStreamsTentativeAccept) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1290,34 +1246,6 @@ func (this ActivityStreamsTentativeAccept) LessThan(o vocab.ActivityStreamsTenta
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1332,20 +1260,6 @@ func (this ActivityStreamsTentativeAccept) LessThan(o vocab.ActivityStreamsTenta
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1691,22 +1605,6 @@ func (this ActivityStreamsTentativeAccept) Serialize() (map[string]interface{},
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1715,14 +1613,6 @@ func (this ActivityStreamsTentativeAccept) Serialize() (map[string]interface{},
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1946,21 +1836,6 @@ func (this *ActivityStreamsTentativeAccept) SetActivityStreamsUrl(i vocab.Activi
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsTentativeAccept) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsTentativeAccept) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsTentativeAccept) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsTentativeAccept) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativereject/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativereject/gen_pkg.go
index 4839007bd..c89a35d53 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativereject/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativereject/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativereject/gen_type_activitystreams_tentativereject.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativereject/gen_type_activitystreams_tentativereject.go
index cb3d1646b..676ec32d5 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativereject/gen_type_activitystreams_tentativereject.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tentativereject/gen_type_activitystreams_tentativereject.go
@@ -63,10 +63,7 @@ type ActivityStreamsTentativeReject struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -298,26 +295,11 @@ func DeserializeTentativeReject(m map[string]interface{}, aliasMap map[string]st
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -414,14 +396,8 @@ func DeserializeTentativeReject(m map[string]interface{}, aliasMap map[string]st
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -460,7 +436,7 @@ func NewActivityStreamsTentativeReject() *ActivityStreamsTentativeReject {
 // TentativeRejectIsDisjointWith returns true if the other provided type is
 // disjoint with the TentativeReject type.
 func TentativeRejectIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -697,23 +673,6 @@ func (this ActivityStreamsTentativeReject) GetActivityStreamsUrl() vocab.Activit
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsTentativeReject) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsTentativeReject) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsTentativeReject) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsTentativeReject) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -785,10 +744,7 @@ func (this ActivityStreamsTentativeReject) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1290,34 +1246,6 @@ func (this ActivityStreamsTentativeReject) LessThan(o vocab.ActivityStreamsTenta
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1332,20 +1260,6 @@ func (this ActivityStreamsTentativeReject) LessThan(o vocab.ActivityStreamsTenta
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1691,22 +1605,6 @@ func (this ActivityStreamsTentativeReject) Serialize() (map[string]interface{},
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1715,14 +1613,6 @@ func (this ActivityStreamsTentativeReject) Serialize() (map[string]interface{},
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1946,21 +1836,6 @@ func (this *ActivityStreamsTentativeReject) SetActivityStreamsUrl(i vocab.Activi
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsTentativeReject) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsTentativeReject) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsTentativeReject) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsTentativeReject) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tombstone/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tombstone/gen_pkg.go
index 21d9da6f3..4fac9fb77 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tombstone/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tombstone/gen_pkg.go
@@ -140,22 +140,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tombstone/gen_type_activitystreams_tombstone.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tombstone/gen_type_activitystreams_tombstone.go
index 8354d5470..d1af93ab1 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tombstone/gen_type_activitystreams_tombstone.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_tombstone/gen_type_activitystreams_tombstone.go
@@ -67,10 +67,7 @@ type ActivityStreamsTombstone struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -287,26 +284,11 @@ func DeserializeTombstone(m map[string]interface{}, aliasMap map[string]string)
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -397,14 +379,8 @@ func DeserializeTombstone(m map[string]interface{}, aliasMap map[string]string)
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -443,7 +419,7 @@ func NewActivityStreamsTombstone() *ActivityStreamsTombstone {
 // TombstoneIsDisjointWith returns true if the other provided type is disjoint
 // with the Tombstone type.
 func TombstoneIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -662,23 +638,6 @@ func (this ActivityStreamsTombstone) GetActivityStreamsUrl() vocab.ActivityStrea
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsTombstone) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsTombstone) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsTombstone) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsTombstone) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -746,10 +705,7 @@ func (this ActivityStreamsTombstone) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1209,34 +1165,6 @@ func (this ActivityStreamsTombstone) LessThan(o vocab.ActivityStreamsTombstone)
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1251,20 +1179,6 @@ func (this ActivityStreamsTombstone) LessThan(o vocab.ActivityStreamsTombstone)
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1586,22 +1500,6 @@ func (this ActivityStreamsTombstone) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1610,14 +1508,6 @@ func (this ActivityStreamsTombstone) Serialize() (map[string]interface{}, error)
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1826,21 +1716,6 @@ func (this *ActivityStreamsTombstone) SetActivityStreamsUrl(i vocab.ActivityStre
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsTombstone) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsTombstone) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsTombstone) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsTombstone) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_travel/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_travel/gen_pkg.go
index 12ad27a8f..bf2b13b20 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_travel/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_travel/gen_pkg.go
@@ -148,22 +148,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_travel/gen_type_activitystreams_travel.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_travel/gen_type_activitystreams_travel.go
index c6adf3b09..03d5f20ab 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_travel/gen_type_activitystreams_travel.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_travel/gen_type_activitystreams_travel.go
@@ -64,10 +64,7 @@ type ActivityStreamsTravel struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -294,26 +291,11 @@ func DeserializeTravel(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -408,14 +390,8 @@ func DeserializeTravel(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -454,7 +430,7 @@ func NewActivityStreamsTravel() *ActivityStreamsTravel {
 // TravelIsDisjointWith returns true if the other provided type is disjoint with
 // the Travel type.
 func TravelIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -685,23 +661,6 @@ func (this ActivityStreamsTravel) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsTravel) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsTravel) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsTravel) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsTravel) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -771,10 +730,7 @@ func (this ActivityStreamsTravel) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1262,34 +1218,6 @@ func (this ActivityStreamsTravel) LessThan(o vocab.ActivityStreamsTravel) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1304,20 +1232,6 @@ func (this ActivityStreamsTravel) LessThan(o vocab.ActivityStreamsTravel) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1655,22 +1569,6 @@ func (this ActivityStreamsTravel) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1679,14 +1577,6 @@ func (this ActivityStreamsTravel) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1905,21 +1795,6 @@ func (this *ActivityStreamsTravel) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsTravel) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsTravel) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsTravel) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsTravel) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_undo/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_undo/gen_pkg.go
index 710e3eaf6..b6e2499d2 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_undo/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_undo/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_undo/gen_type_activitystreams_undo.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_undo/gen_type_activitystreams_undo.go
index 323470148..722b5de0a 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_undo/gen_type_activitystreams_undo.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_undo/gen_type_activitystreams_undo.go
@@ -62,10 +62,7 @@ type ActivityStreamsUndo struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -297,26 +294,11 @@ func DeserializeUndo(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -413,14 +395,8 @@ func DeserializeUndo(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -459,7 +435,7 @@ func NewActivityStreamsUndo() *ActivityStreamsUndo {
 // UndoIsDisjointWith returns true if the other provided type is disjoint with the
 // Undo type.
 func UndoIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -696,23 +672,6 @@ func (this ActivityStreamsUndo) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsUndo) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsUndo) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsUndo) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsUndo) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -783,10 +742,7 @@ func (this ActivityStreamsUndo) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1288,34 +1244,6 @@ func (this ActivityStreamsUndo) LessThan(o vocab.ActivityStreamsUndo) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1330,20 +1258,6 @@ func (this ActivityStreamsUndo) LessThan(o vocab.ActivityStreamsUndo) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1689,22 +1603,6 @@ func (this ActivityStreamsUndo) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1713,14 +1611,6 @@ func (this ActivityStreamsUndo) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1944,21 +1834,6 @@ func (this *ActivityStreamsUndo) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsUndo) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsUndo) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsUndo) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsUndo) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_update/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_update/gen_pkg.go
index 799036769..1609bb588 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_update/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_update/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_update/gen_type_activitystreams_update.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_update/gen_type_activitystreams_update.go
index 1b0e3d715..46b469af3 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_update/gen_type_activitystreams_update.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_update/gen_type_activitystreams_update.go
@@ -59,10 +59,7 @@ type ActivityStreamsUpdate struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -294,26 +291,11 @@ func DeserializeUpdate(m map[string]interface{}, aliasMap map[string]string) (*A
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -410,14 +392,8 @@ func DeserializeUpdate(m map[string]interface{}, aliasMap map[string]string) (*A
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -456,7 +432,7 @@ func NewActivityStreamsUpdate() *ActivityStreamsUpdate {
 // UpdateIsDisjointWith returns true if the other provided type is disjoint with
 // the Update type.
 func UpdateIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -693,23 +669,6 @@ func (this ActivityStreamsUpdate) GetActivityStreamsUrl() vocab.ActivityStreamsU
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsUpdate) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsUpdate) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsUpdate) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsUpdate) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -780,10 +739,7 @@ func (this ActivityStreamsUpdate) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1285,34 +1241,6 @@ func (this ActivityStreamsUpdate) LessThan(o vocab.ActivityStreamsUpdate) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1327,20 +1255,6 @@ func (this ActivityStreamsUpdate) LessThan(o vocab.ActivityStreamsUpdate) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1686,22 +1600,6 @@ func (this ActivityStreamsUpdate) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1710,14 +1608,6 @@ func (this ActivityStreamsUpdate) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1941,21 +1831,6 @@ func (this *ActivityStreamsUpdate) SetActivityStreamsUrl(i vocab.ActivityStreams
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsUpdate) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsUpdate) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsUpdate) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsUpdate) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_video/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_video/gen_pkg.go
index 8bd9d0539..e7fcae287 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_video/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_video/gen_pkg.go
@@ -136,22 +136,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTagProperty" non-functional property
 	// in the vocabulary "ActivityStreams"
 	DeserializeTagPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTagProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_video/gen_type_activitystreams_video.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_video/gen_type_activitystreams_video.go
index 346a8ef8b..75a1baeae 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_video/gen_type_activitystreams_video.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_video/gen_type_activitystreams_video.go
@@ -49,10 +49,7 @@ type ActivityStreamsVideo struct {
 	ActivityStreamsStartTime    vocab.ActivityStreamsStartTimeProperty
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -264,26 +261,11 @@ func DeserializeVideo(m map[string]interface{}, aliasMap map[string]string) (*Ac
 	} else if p != nil {
 		this.ActivityStreamsTag = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -372,14 +354,8 @@ func DeserializeVideo(m map[string]interface{}, aliasMap map[string]string) (*Ac
 			continue
 		} else if k == "tag" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -418,7 +394,7 @@ func NewActivityStreamsVideo() *ActivityStreamsVideo {
 // VideoIsDisjointWith returns true if the other provided type is disjoint with
 // the Video type.
 func VideoIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -625,23 +601,6 @@ func (this ActivityStreamsVideo) GetActivityStreamsUrl() vocab.ActivityStreamsUr
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsVideo) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsVideo) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsVideo) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsVideo) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -713,10 +672,7 @@ func (this ActivityStreamsVideo) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsStartTime, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1162,34 +1118,6 @@ func (this ActivityStreamsVideo) LessThan(o vocab.ActivityStreamsVideo) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1204,20 +1132,6 @@ func (this ActivityStreamsVideo) LessThan(o vocab.ActivityStreamsVideo) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1531,22 +1445,6 @@ func (this ActivityStreamsVideo) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTag.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1555,14 +1453,6 @@ func (this ActivityStreamsVideo) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1761,21 +1651,6 @@ func (this *ActivityStreamsVideo) SetActivityStreamsUrl(i vocab.ActivityStreamsU
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsVideo) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsVideo) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsVideo) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsVideo) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_view/gen_pkg.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_view/gen_pkg.go
index 4164fb615..609c85e23 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_view/gen_pkg.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_view/gen_pkg.go
@@ -152,22 +152,10 @@ type privateManager interface {
 	// method for the "ActivityStreamsTargetProperty" non-functional
 	// property in the vocabulary "ActivityStreams"
 	DeserializeTargetPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsTargetProperty, error)
-	// DeserializeTeamPropertyForgeFed returns the deserialization method for
-	// the "ForgeFedTeamProperty" non-functional property in the
-	// vocabulary "ForgeFed"
-	DeserializeTeamPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTeamProperty, error)
-	// DeserializeTicketsTrackedByPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTicketsTrackedByProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTicketsTrackedByPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTicketsTrackedByProperty, error)
 	// DeserializeToPropertyActivityStreams returns the deserialization method
 	// for the "ActivityStreamsToProperty" non-functional property in the
 	// vocabulary "ActivityStreams"
 	DeserializeToPropertyActivityStreams() func(map[string]interface{}, map[string]string) (vocab.ActivityStreamsToProperty, error)
-	// DeserializeTracksTicketsForPropertyForgeFed returns the deserialization
-	// method for the "ForgeFedTracksTicketsForProperty" non-functional
-	// property in the vocabulary "ForgeFed"
-	DeserializeTracksTicketsForPropertyForgeFed() func(map[string]interface{}, map[string]string) (vocab.ForgeFedTracksTicketsForProperty, error)
 	// DeserializeTypePropertyJSONLD returns the deserialization method for
 	// the "JSONLDTypeProperty" non-functional property in the vocabulary
 	// "JSONLD"
diff --git a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_view/gen_type_activitystreams_view.go b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_view/gen_type_activitystreams_view.go
index 835c4eaac..956140f5d 100644
--- a/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_view/gen_type_activitystreams_view.go
+++ b/vendor/github.com/superseriousbusiness/activity/streams/impl/activitystreams/type_view/gen_type_activitystreams_view.go
@@ -59,10 +59,7 @@ type ActivityStreamsView struct {
 	ActivityStreamsSummary      vocab.ActivityStreamsSummaryProperty
 	ActivityStreamsTag          vocab.ActivityStreamsTagProperty
 	ActivityStreamsTarget       vocab.ActivityStreamsTargetProperty
-	ForgeFedTeam                vocab.ForgeFedTeamProperty
-	ForgeFedTicketsTrackedBy    vocab.ForgeFedTicketsTrackedByProperty
 	ActivityStreamsTo           vocab.ActivityStreamsToProperty
-	ForgeFedTracksTicketsFor    vocab.ForgeFedTracksTicketsForProperty
 	JSONLDType                  vocab.JSONLDTypeProperty
 	ActivityStreamsUpdated      vocab.ActivityStreamsUpdatedProperty
 	ActivityStreamsUrl          vocab.ActivityStreamsUrlProperty
@@ -294,26 +291,11 @@ func DeserializeView(m map[string]interface{}, aliasMap map[string]string) (*Act
 	} else if p != nil {
 		this.ActivityStreamsTarget = p
 	}
-	if p, err := mgr.DeserializeTeamPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTeam = p
-	}
-	if p, err := mgr.DeserializeTicketsTrackedByPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTicketsTrackedBy = p
-	}
 	if p, err := mgr.DeserializeToPropertyActivityStreams()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
 		this.ActivityStreamsTo = p
 	}
-	if p, err := mgr.DeserializeTracksTicketsForPropertyForgeFed()(m, aliasMap); err != nil {
-		return nil, err
-	} else if p != nil {
-		this.ForgeFedTracksTicketsFor = p
-	}
 	if p, err := mgr.DeserializeTypePropertyJSONLD()(m, aliasMap); err != nil {
 		return nil, err
 	} else if p != nil {
@@ -410,14 +392,8 @@ func DeserializeView(m map[string]interface{}, aliasMap map[string]string) (*Act
 			continue
 		} else if k == "target" {
 			continue
-		} else if k == "team" {
-			continue
-		} else if k == "ticketsTrackedBy" {
-			continue
 		} else if k == "to" {
 			continue
-		} else if k == "tracksTicketsFor" {
-			continue
 		} else if k == "type" {
 			continue
 		} else if k == "updated" {
@@ -456,7 +432,7 @@ func NewActivityStreamsView() *ActivityStreamsView {
 // ViewIsDisjointWith returns true if the other provided type is disjoint with the
 // View type.
 func ViewIsDisjointWith(other vocab.Type) bool {
-	disjointWith := []string{"Link", "Mention"}
+	disjointWith := []string{"Hashtag", "Link", "Mention"}
 	for _, disjoint := range disjointWith {
 		if disjoint == other.GetTypeName() {
 			return true
@@ -693,23 +669,6 @@ func (this ActivityStreamsView) GetActivityStreamsUrl() vocab.ActivityStreamsUrl
 	return this.ActivityStreamsUrl
 }
 
-// GetForgeFedTeam returns the "team" property if it exists, and nil otherwise.
-func (this ActivityStreamsView) GetForgeFedTeam() vocab.ForgeFedTeamProperty {
-	return this.ForgeFedTeam
-}
-
-// GetForgeFedTicketsTrackedBy returns the "ticketsTrackedBy" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsView) GetForgeFedTicketsTrackedBy() vocab.ForgeFedTicketsTrackedByProperty {
-	return this.ForgeFedTicketsTrackedBy
-}
-
-// GetForgeFedTracksTicketsFor returns the "tracksTicketsFor" property if it
-// exists, and nil otherwise.
-func (this ActivityStreamsView) GetForgeFedTracksTicketsFor() vocab.ForgeFedTracksTicketsForProperty {
-	return this.ForgeFedTracksTicketsFor
-}
-
 // GetJSONLDId returns the "id" property if it exists, and nil otherwise.
 func (this ActivityStreamsView) GetJSONLDId() vocab.JSONLDIdProperty {
 	return this.JSONLDId
@@ -780,10 +739,7 @@ func (this ActivityStreamsView) JSONLDContext() map[string]string {
 	m = this.helperJSONLDContext(this.ActivityStreamsSummary, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTag, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTarget, m)
-	m = this.helperJSONLDContext(this.ForgeFedTeam, m)
-	m = this.helperJSONLDContext(this.ForgeFedTicketsTrackedBy, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsTo, m)
-	m = this.helperJSONLDContext(this.ForgeFedTracksTicketsFor, m)
 	m = this.helperJSONLDContext(this.JSONLDType, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUpdated, m)
 	m = this.helperJSONLDContext(this.ActivityStreamsUrl, m)
@@ -1285,34 +1241,6 @@ func (this ActivityStreamsView) LessThan(o vocab.ActivityStreamsView) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "team"
-	if lhs, rhs := this.ForgeFedTeam, o.GetForgeFedTeam(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
-	// Compare property "ticketsTrackedBy"
-	if lhs, rhs := this.ForgeFedTicketsTrackedBy, o.GetForgeFedTicketsTrackedBy(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "to"
 	if lhs, rhs := this.ActivityStreamsTo, o.GetActivityStreamsTo(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1327,20 +1255,6 @@ func (this ActivityStreamsView) LessThan(o vocab.ActivityStreamsView) bool {
 		// Anything else is greater than nil
 		return false
 	} // Else: Both are nil
-	// Compare property "tracksTicketsFor"
-	if lhs, rhs := this.ForgeFedTracksTicketsFor, o.GetForgeFedTracksTicketsFor(); lhs != nil && rhs != nil {
-		if lhs.LessThan(rhs) {
-			return true
-		} else if rhs.LessThan(lhs) {
-			return false
-		}
-	} else if lhs == nil && rhs != nil {
-		// Nil is less than anything else
-		return true
-	} else if rhs != nil && rhs == nil {
-		// Anything else is greater than nil
-		return false
-	} // Else: Both are nil
 	// Compare property "type"
 	if lhs, rhs := this.JSONLDType, o.GetJSONLDType(); lhs != nil && rhs != nil {
 		if lhs.LessThan(rhs) {
@@ -1686,22 +1600,6 @@ func (this ActivityStreamsView) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTarget.Name()] = i
 		}
 	}
-	// Maybe serialize property "team"
-	if this.ForgeFedTeam != nil {
-		if i, err := this.ForgeFedTeam.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTeam.Name()] = i
-		}
-	}
-	// Maybe serialize property "ticketsTrackedBy"
-	if this.ForgeFedTicketsTrackedBy != nil {
-		if i, err := this.ForgeFedTicketsTrackedBy.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTicketsTrackedBy.Name()] = i
-		}
-	}
 	// Maybe serialize property "to"
 	if this.ActivityStreamsTo != nil {
 		if i, err := this.ActivityStreamsTo.Serialize(); err != nil {
@@ -1710,14 +1608,6 @@ func (this ActivityStreamsView) Serialize() (map[string]interface{}, error) {
 			m[this.ActivityStreamsTo.Name()] = i
 		}
 	}
-	// Maybe serialize property "tracksTicketsFor"
-	if this.ForgeFedTracksTicketsFor != nil {
-		if i, err := this.ForgeFedTracksTicketsFor.Serialize(); err != nil {
-			return nil, err
-		} else if i != nil {
-			m[this.ForgeFedTracksTicketsFor.Name()] = i
-		}
-	}
 	// Maybe serialize property "type"
 	if this.JSONLDType != nil {
 		if i, err := this.JSONLDType.Serialize(); err != nil {
@@ -1941,21 +1831,6 @@ func (this *ActivityStreamsView) SetActivityStreamsUrl(i vocab.ActivityStreamsUr
 	this.ActivityStreamsUrl = i
 }
 
-// SetForgeFedTeam sets the "team" property.
-func (this *ActivityStreamsView) SetForgeFedTeam(i vocab.ForgeFedTeamProperty) {
-	this.ForgeFedTeam = i
-}
-
-// SetForgeFedTicketsTrackedBy sets the "ticketsTrackedBy" property.
-func (this *ActivityStreamsView) SetForgeFedTicketsTrackedBy(i vocab.ForgeFedTicketsTrackedByProperty) {
-	this.ForgeFedTicketsTrackedBy = i
-}
-
-// SetForgeFedTracksTicketsFor sets the "tracksTicketsFor" property.
-func (this *ActivityStreamsView) SetForgeFedTracksTicketsFor(i vocab.ForgeFedTracksTicketsForProperty) {
-	this.ForgeFedTracksTicketsFor = i
-}
-
 // SetJSONLDId sets the "id" property.
 func (this *ActivityStreamsView) SetJSONLDId(i vocab.JSONLDIdProperty) {
 	this.JSONLDId = i