diff --git a/devNotes/encyclopedia.js b/devNotes/encyclopedia.js
index d17f6b7323ec468fe415df91d0ea3bb7ea94d9bf..f3d9d3c047a66fa2df96ae3eb1506936a397b023 100644
--- a/devNotes/encyclopedia.js
+++ b/devNotes/encyclopedia.js
@@ -69,89 +69,6 @@ App.Encyclopedia.UI = function() {
 			case "Whoring Skill":
 				r.push(highlight("Whoring skill"), "is available in three levels. It improves performance on all sexual assignments, though it affects whoring or working in the brothel most. Training methods include schooling (up to level one), personal attention (up to level one), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited).");
 				break;
-			// SLAVE PARAPHILIAS
-			case "Paraphilias":
-				r.push(highlight("Paraphilias"), "are intense forms of sexual", link("flaws"), "that cannot be softened.");
-				r.push("Slaves with a paraphilia excel at certain jobs, but may suffer penalties at others.");
-				r.toParagraph();
-
-				r.push("Choose a more particular entry below:");
-				r.toNode("div");
-				break;
-			case "Abusiveness":
-				r.push(highlight("Abusiveness"), "is a paraphilia, an intense form of sexual", link("flaw", "Flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push(link("Doms"), "serving as", link("Head Girls", "Head Girl"));
-				r.push("may become abusive if allowed to punish slaves by molesting them. They can be satisfied by work as the Head Girl or", link("Wardeness"), ". Abusive Head Girls are more effective when allowed or encouraged to punish slaves severely.");
-				r.toParagraph();
-				break;
-			case "Anal Addicts":
-				r.push(highlight("Anal addiction"), "is a paraphilia, an intense form of sexual", link("flaw", "Flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push(link("Buttsluts"), "whose only available hole for receptive intercourse is the anus may become anal addicts. They can be satisfied by huge buttplugs, the sodomizing drug applicator kitchen upgrade, or by work that involves frequent anal sex. Anal addicts perform well on assignments involving anal sex.");
-				r.toParagraph();
-				break;
-			case "Attention Whores":
-				r.push(highlight("Attention Whores"), "is a paraphilia, an intense form of sexual", link("flaw", "Flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push(link("Humiliation Fetishists"), "on public sexual assignments may become Attention Whores. They can be satisfied by total nudity or by work that involves frequent public sex. Attention whores do very well at");
-				r.push(link("public service", "Public Service"));
-				r.addToLast(".");
-				r.toParagraph();
-				break;
-			case "Breast Obsession":
-				r.push(highlight("Pectomania,"), "also known as breast growth obsession, is a paraphilia, an intense form of sexual", link("flaw", "Flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push(link("Boob fetishists", "Boob Fetishists"), "may become obsessed with breast expansion as their breasts grow. They can be satisfied by breast injections or work as a cow, and will temporarily accept getting neither if their health is low.");
-				r.toParagraph();
-				break;
-			case "Breeding Obsession":
-				r.push(highlight("Breeding obsession"), "is a paraphilia, an intense form of sexual", link("flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push(link("Pregnancy Fetishists"), "who are repeatedly bred or are serving in an industrialized");
-				r.push(link("Dairy"), "may develop breeding obsessions. They can be satisfied by pregnancy, or constant vaginal sex with their owner. Slaves with breeding obsessions will not suffer negative mental effects from serving in an industrialized dairy that keeps them pregnant.");
-				r.toParagraph();
-				break;
-			case "Cum Addicts":
-				r.push(highlight("Cum addiction"), "is a paraphilia, an intense form of sexual", link("flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push(link("Cumsluts"), "who eat out of phallic feeders or are fed cum may become cum addicts. They can be satisfied by cum diets, the phallic feeder kitchen upgrade, or by sex work that involves frequent fellatio. Cum addicts will perform well on assignments involving oral sex.");
-				r.toParagraph();
-				break;
-			case "Maliciousness":
-				r.push("Sexual", highlight("maliciousness"), "is a paraphilia, an intense form of sexual", link("flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push(link("Sadists"), "serving as", link("Wardeness"), "may become sexually malicious.");
-				r.push("They can be satisfied by work as the", link("Head Girl"), "or", link("Wardeness.", "Wardeness"));
-				r.push("Sexually malicious Wardenesses break slaves very quickly but damage their sex drives doing so.");
-				r.toParagraph();
-				break;
-			case "Self Hatred":
-				r.push(highlight("self hatred"), "is a paraphilia, an intense form of sexual", link("flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push("Self hating slaves can be satisfied by work in an industrialized dairy, in an arcade, or in a glory hole, and will not suffer negative mental effects for doing so.");
-				r.push(link("Masochists"), "serving in those places have a chance to become self hating, and even extremely low");
-				r.push(trust(), "may cause the paraphilia.");
-				r.toParagraph();
-				break;
-			case "Self Neglect":
-				r.push("Sexual", highlight("self neglect"), "is a paraphilia, an intense form of sexual", link("flaws"), "that cannot be softened.");
-				r.toParagraph();
-
-				r.push(link("Submissives"), "serving on public sexual assignment may become sexually self neglectful.");
-				r.push("Such slaves can be satisfied by most kinds of sex work.");
-				r.push("Slaves willing to neglect their own pleasure do very well at", link("whoring", "Whoring"));
-				r.addToLast(".");
-				r.toParagraph();
-				break;
 			// SLAVE RELATIONSHIPS
 			case "Relationships":
 				r.push("Slaves can develop many different", highlight("relationships"), "as they become accustomed to their lives, which offer many benefits and some downsides. It is possible for the player to push slaves towards one kind of relationship or another, but slaves' feelings are less susceptible to complete control than their bodies. All relationships in Free Cities are one-to-one, which is a limitation imposed by Twine.");
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index 51b6e9d5114ce18b1cee6bb4fd55762b6825f87c..b727b3257e481937d370679abc69d43aaad2797a 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -49,69 +49,6 @@ SLAVE SKILLS
 <<case "Whoring Skill">>
 	''Whoring skill'' is available in three levels. It improves performance on all sexual assignments, though it affects whoring or working in the brothel most. Training methods include schooling (up to level one), personal attention (up to level one), Head Girl attention (up to the Head Girl's skill), and on the job experience (unlimited).
 
-/**********
-SLAVE PARAPHILIAS
-**********/
-<<case "Paraphilias">>
-	''Paraphilias'' are intense forms of sexual <<= App.Encyclopedia.Dialog.linkSC("flaws", "Flaws")>> that cannot be softened. Slaves with a paraphilia excel at certain jobs, but may suffer penalties at others.
-
-	<br><br>
-	Choose a more particular entry below:
-	<br>
-
-<<case "Abusiveness">>
-	''Abusiveness'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br><<= App.Encyclopedia.Dialog.linkSC("Doms", "Doms")>> serving as <<= App.Encyclopedia.Dialog.linkSC("Head Girls", "Head Girl")>> may become abusive if allowed to punish slaves by molesting them. They can be satisfied by work as the Head Girl or <<= App.Encyclopedia.Dialog.linkSC("Wardeness", "Wardeness")>>. Abusive Head Girls are more effective when allowed or encouraged to punish slaves severely.
-
-
-<<case "Anal Addicts">>
-	''Anal addiction'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br><<= App.Encyclopedia.Dialog.linkSC("Buttsluts", "Buttsluts")>> whose only available hole for receptive intercourse is the anus may become anal addicts. They can be satisfied by huge buttplugs, the sodomizing drug applicator kitchen upgrade, or by work that involves frequent anal sex. Anal addicts perform well on assignments involving anal sex.
-
-
-<<case "Attention Whores">>
-	''Attention Whores'' suffer from a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br><<= App.Encyclopedia.Dialog.linkSC("Humiliation Fetishists", "Humiliation Fetishists")>> on public sexual assignments may become Attention Whores. They can be satisfied by total nudity or by work that involves frequent public sex. Attention whores do very well at <<= App.Encyclopedia.Dialog.linkSC("public service", "Public Service")>>.
-
-
-<<case "Breast Obsession">>
-	''Pectomania,'' also known as breast growth obsession, is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br><<= App.Encyclopedia.Dialog.linkSC("Boob fetishists", "Boob Fetishists")>> may become obsessed with breast expansion as their breasts grow. They can be satisfied by breast injections or work as a cow, and will temporarily accept getting neither if their health is low.
-
-
-<<case "Breeding Obsession">>
-	''Breeding obsession'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br><<= App.Encyclopedia.Dialog.linkSC("Pregnancy Fetishists", "Pregnancy Fetishists")>> who are repeatedly bred or are serving in an industrialized <<= App.Encyclopedia.Dialog.linkSC("Dairy", "Dairy")>> may develop breeding obsessions. They can be satisfied by pregnancy, or constant vaginal sex with their owner. Slaves with breeding obsessions will not suffer negative mental effects from serving in an industrialized dairy that keeps them pregnant.
-
-
-<<case "Cum Addicts">>
-	''Cum addiction'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br><<= App.Encyclopedia.Dialog.linkSC("Cumsluts", "Cumsluts")>> who eat out of phallic feeders or are fed cum may become cum addicts. They can be satisfied by cum diets, the phallic feeder kitchen upgrade, or by sex work that involves frequent fellatio. Cum addicts will perform well on assignments involving oral sex.
-
-
-<<case "Maliciousness">>
-	Sexual ''maliciousness'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br><<= App.Encyclopedia.Dialog.linkSC("Sadists", "Sadists")>> serving as <<= App.Encyclopedia.Dialog.linkSC("Wardeness", "Wardeness")>> may become sexually malicious. They can be satisfied by work as the <<= App.Encyclopedia.Dialog.linkSC("Head Girl", "Head Girl")>> or Wardeness. Sexually malicious Wardenesses break slaves very quickly but damage their sex drives doing so.
-
-
-<<case "Self Hatred">>
-	Sexual ''self hatred'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br>Self hating slaves can be satisfied by work in an industrialized dairy, in an arcade, or in a glory hole, and will not suffer negative mental effects for doing so. <<= App.Encyclopedia.Dialog.linkSC("Masochists", "Masochists")>> serving in those places have a chance to become self hating, and even extremely low @@.mediumaquamarine;<<= App.Encyclopedia.Dialog.linkSC("trust", "Trust")>>@@ may cause the paraphilia.
-
-
-<<case "Self Neglect">>
-	Sexual ''self neglect'' is a paraphilia, an intense form of sexual <<= App.Encyclopedia.Dialog.linkSC("flaw", "Flaws")>> that cannot be softened.
-
-	<br><br><<= App.Encyclopedia.Dialog.linkSC("Submissives", "Submissives")>> serving on public sexual assignment may become sexually self neglectful. Such slaves can be satisfied by most kinds of sex work. Slaves willing to neglect their own pleasure do very well at <<= App.Encyclopedia.Dialog.linkSC("whoring", "Whoring")>>.
-
 /**********
 SLAVE RELATIONSHIPS
 **********/
diff --git a/src/gui/Encyclopedia/encyclopediaFetish.js b/src/gui/Encyclopedia/encyclopediaFetish.js
index 97bc4666601ed69f05a1dba7a0371d28296c861a..873ebd3234550ace0833990f129ff671b7d3c9ee 100644
--- a/src/gui/Encyclopedia/encyclopediaFetish.js
+++ b/src/gui/Encyclopedia/encyclopediaFetish.js
@@ -240,5 +240,6 @@ App.Encyclopedia.addCategory("fetish", function() {
 	links.push(App.Encyclopedia.Dialog.linkDOM("Pregnancy Fetishists"));
 	links.push(App.Encyclopedia.Dialog.linkDOM("Sadists"));
 	links.push(App.Encyclopedia.Dialog.linkDOM("Submissives"));
+	links.push(App.Encyclopedia.Dialog.linkDOM("Paraphilias Overview"));
 	return App.UI.DOM.generateLinksStrip(links);
 });
diff --git a/src/gui/Encyclopedia/encyclopediaParaphilias.js b/src/gui/Encyclopedia/encyclopediaParaphilias.js
new file mode 100644
index 0000000000000000000000000000000000000000..d18261f30bbd294a56cb5097a2f2a6ac26d1ffe7
--- /dev/null
+++ b/src/gui/Encyclopedia/encyclopediaParaphilias.js
@@ -0,0 +1,136 @@
+App.Encyclopedia.addArticle("Paraphilias Overview", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push(App.UI.DOM.makeElement("span", "Paraphilias", ["bold"]), "are intense forms of sexual", App.Encyclopedia.Dialog.linkDOM("flaws", "Flaws"), "that cannot be softened.");
+	r.push("Slaves with a paraphilia excel at certain jobs, but may suffer penalties at others.");
+	r.toParagraph();
+
+	App.Events.addNode(f, ["Choose a more particular entry below:"], "div");
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Abusiveness", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push(App.UI.DOM.makeElement("span", "Abusiveness", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaw", "Flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push(App.Encyclopedia.Dialog.linkDOM("Doms"), "serving as", App.Encyclopedia.Dialog.linkDOM("Head Girls"));
+	r.push("may become abusive if allowed to punish slaves by molesting them. They can be satisfied by work as the Head Girl or", App.Encyclopedia.Dialog.linkDOM("Wardeness"), ". Abusive Head Girls are more effective when allowed or encouraged to punish slaves severely.");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Anal Addicts", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push(App.UI.DOM.makeElement("span", "Anal addiction", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaw", "Flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push(App.Encyclopedia.Dialog.linkDOM("Buttsluts"), "whose only available hole for receptive intercourse is the anus may become anal addicts. They can be satisfied by huge buttplugs, the sodomizing drug applicator kitchen upgrade, or by work that involves frequent anal sex. Anal addicts perform well on assignments involving anal sex.");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Attention Whores", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push(App.UI.DOM.makeElement("span", "Attention Whores", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaw", "Flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push(App.Encyclopedia.Dialog.linkDOM("Humiliation Fetishists"), "on public sexual assignments may become Attention Whores. They can be satisfied by total nudity or by work that involves frequent public sex. Attention whores do very well at");
+	r.push(App.Encyclopedia.Dialog.linkDOM("public service", "Public Service"));
+	r.addToLast(".");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Breast Obsession", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push(App.UI.DOM.makeElement("span", "Pectomania,", ["bold"]), "also known as breast growth obsession, is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaw", "Flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push(App.Encyclopedia.Dialog.linkDOM("Boob fetishists", "Boob Fetishists"), "may become obsessed with breast expansion as their breasts grow. They can be satisfied by breast injections or work as a cow, and will temporarily accept getting neither if their health is low.");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Breeding Obsession", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push(App.UI.DOM.makeElement("span", "Breeding obsession", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push(App.Encyclopedia.Dialog.linkDOM("Pregnancy Fetishists"), "who are repeatedly bred or are serving in an industrialized");
+	r.push(App.Encyclopedia.Dialog.linkDOM("Dairy"), "may develop breeding obsessions. They can be satisfied by pregnancy, or constant vaginal sex with their owner. Slaves with breeding obsessions will not suffer negative mental effects from serving in an industrialized dairy that keeps them pregnant.");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Cum Addicts", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push(App.UI.DOM.makeElement("span", "Cum addiction", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push(App.Encyclopedia.Dialog.linkDOM("Cumsluts"), "who eat out of phallic feeders or are fed cum may become cum addicts. They can be satisfied by cum diets, the phallic feeder kitchen upgrade, or by sex work that involves frequent fellatio. Cum addicts will perform well on assignments involving oral sex.");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Maliciousness", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push("Sexual", App.UI.DOM.makeElement("span", "maliciousness", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push(App.Encyclopedia.Dialog.linkDOM("Sadists"), "serving as", App.Encyclopedia.Dialog.linkDOM("Wardeness"), "may become sexually malicious.");
+	r.push("They can be satisfied by work as the", App.Encyclopedia.Dialog.linkDOM("Head Girl"), "or", App.Encyclopedia.Dialog.linkDOM("Wardeness.", "Wardeness"));
+	r.push("Sexually malicious Wardenesses break slaves very quickly but damage their sex drives doing so.");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Self Hatred", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push(App.UI.DOM.makeElement("span","self hatred", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push("Self hating slaves can be satisfied by work in an industrialized dairy, in an arcade, or in a glory hole, and will not suffer negative mental effects for doing so.");
+	r.push(App.Encyclopedia.Dialog.linkDOM("Masochists"), "serving in those places have a chance to become self hating, and even extremely low");
+	r.push(App.Encyclopedia.Dialog.linkDOM("trust", "Trust", "mediumaquamarine"), "may cause the paraphilia.");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addArticle("Self Neglect", function() {
+	const f = new DocumentFragment();
+	const r = new SpacedTextAccumulator(f);
+	r.push("Sexual", App.UI.DOM.makeElement("span", "self neglect", ["bold"]), "is a paraphilia, an intense form of sexual", App.Encyclopedia.Dialog.linkDOM("flaws"), "that cannot be softened.");
+	r.toParagraph();
+
+	r.push(App.Encyclopedia.Dialog.linkDOM("Submissives"), "serving on public sexual assignment may become sexually self neglectful.");
+	r.push("Such slaves can be satisfied by most kinds of sex work.");
+	r.push("Slaves willing to neglect their own pleasure do very well at", App.Encyclopedia.Dialog.linkDOM("whoring", "Whoring"));
+	r.addToLast(".");
+	r.toParagraph();
+	return f;
+}, "Paraphilias");
+
+App.Encyclopedia.addCategory("Paraphilias", function() {
+	const r = [];
+	r.push(App.Encyclopedia.Dialog.linkDOM("Paraphilias Overview"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Abusiveness"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Anal Addicts"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Attention Whores"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Breast Obsession"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Breeding Obsession"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Cum Addicts"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Maliciousness"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Self Hatred"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Self Neglect"));
+	r.push(App.Encyclopedia.Dialog.linkDOM("Fetishes"));
+	return App.UI.DOM.generateLinksStrip(r);
+});
diff --git a/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw b/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
index f218d01dc55f946566b18f4e78446db3386832bc..5912c49a0b788f9935a1a5fe05ff8ff8549eb39c 100644
--- a/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
+++ b/src/gui/Encyclopedia/encyclopediaRelatedLinks.tw
@@ -24,21 +24,6 @@ SLAVE SKILLS
 	| <<= App.Encyclopedia.Dialog.linkSC("Whoring Skill", "Whoring Skill")>>
 	| <<= App.Encyclopedia.Dialog.linkSC("Career Experience", "Career Experience")>>
 
-/**********
-SLAVE PARAPHILIAS
-**********/
-<<case "Abusiveness" "Anal Addicts" "Attention Whores" "Breast Obsession" "Breeding Obsession" "Cum Addicts" "Maliciousness" "Paraphilias" "Self Hatred" "Self Neglect">>
-	<<= App.Encyclopedia.Dialog.linkSC("Abusiveness", "Abusiveness")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Anal Addicts", "Anal Addicts")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Attention Whores", "Attention Whores")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Breast Obsession", "Breast Obsession")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Breeding Obsession", "Breeding Obsession")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Cum Addicts", "Cum Addicts")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Maliciousness", "Maliciousness")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Self Hatred", "Self Hatred")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Self Neglect", "Self Neglect")>>
-	| <<= App.Encyclopedia.Dialog.linkSC("Fetishes", "Fetishes")>>
-
 /**********
 SLAVE RELATIONSHIPS
 **********/
diff --git a/src/gui/Encyclopedia/encyclopediaToC.js b/src/gui/Encyclopedia/encyclopediaToC.js
index 28311d2de4e588140a42ab69d3ef284bdbebbc3e..3d8a8a5e99ea766b7c6eb33af85be6614067b976 100644
--- a/src/gui/Encyclopedia/encyclopediaToC.js
+++ b/src/gui/Encyclopedia/encyclopediaToC.js
@@ -22,7 +22,7 @@ App.Encyclopedia.addArticle("Table of Contents", function() {
 	outerDiv.append(div);
 	div = document.createElement("div");
 	div.append(App.Encyclopedia.Dialog.linkDOM("Slave Fetishes", "Fetishes"), " / ",
-		App.Encyclopedia.Dialog.linkDOM("Paraphilias", "Paraphilias"));
+		App.Encyclopedia.Dialog.linkDOM("Paraphilias Overview"));
 	outerDiv.append(div);
 	div = document.createElement("div");
 	div.append(App.Encyclopedia.Dialog.linkDOM("Quirks", "Quirks"), " / ",
diff --git a/src/gui/Encyclopedia/encyclopediaX-SeriesArcology.js b/src/gui/Encyclopedia/encyclopediaX-SeriesArcology.js
index 979fa95701ca068663db4722c32eeb433e993bc3..a18dcb1bb9bb1fb0dacd9d1ba1c94e1db2cb19c6 100644
--- a/src/gui/Encyclopedia/encyclopediaX-SeriesArcology.js
+++ b/src/gui/Encyclopedia/encyclopediaX-SeriesArcology.js
@@ -243,7 +243,7 @@ App.Encyclopedia.addArticle("Media Hub", function() {
 	r.push("Viewership can also be driven by investing cash in promotion and advertising, or by search engine optimization and feed hacking.");
 	r.toParagraph();
 
-	r.push("Slaves will produce porn in a variety of genres based on their characteristics. By default, her viewers will decide what she focuses on with their views and credits, but you can upgrade the media hub to allow you to choose a particular genre for a slave to focus on. Having too many slaves focusing on a particular genre will decrease the ability of that genre to draw new viewers. Genres associated with", App.Encyclopedia.Dialog.linkDOM("paraphilias", "Paraphilias"), "will have their viewership increase fastest, followed by", App.Encyclopedia.Dialog.linkDOM("fetish", "Fetishes"), "genres. More general genres (such as those based on age, weight, and build) grow slowly, and genres associated with sexual", App.Encyclopedia.Dialog.linkDOM("quirks", "Quirks"), "grow slowest of all, and are likely to require investment to promote.");
+	r.push("Slaves will produce porn in a variety of genres based on their characteristics. By default, her viewers will decide what she focuses on with their views and credits, but you can upgrade the media hub to allow you to choose a particular genre for a slave to focus on. Having too many slaves focusing on a particular genre will decrease the ability of that genre to draw new viewers. Genres associated with", App.Encyclopedia.Dialog.linkDOM("paraphilias", "Paraphilias Overview"), "will have their viewership increase fastest, followed by", App.Encyclopedia.Dialog.linkDOM("fetish", "Fetishes"), "genres. More general genres (such as those based on age, weight, and build) grow slowly, and genres associated with sexual", App.Encyclopedia.Dialog.linkDOM("quirks", "Quirks"), "grow slowest of all, and are likely to require investment to promote.");
 	r.toParagraph();
 
 	r.push("If you stop producing porn of a particular slave, her viewership will decline over time, until she is once again unknown.");