8 files changed, 19 insertions, 17 deletions
diff --git a/src/data/things/artist.js b/src/data/things/artist.js
index a51723c4..391a9806 100644
--- a/src/data/things/artist.js
+++ b/src/data/things/artist.js
@@ -3,11 +3,11 @@ import find from '#find';
 import {isName, validateArrayItems} from '#validators';
 
 import {
+  contentString,
   directory,
   fileExtension,
   flag,
   name,
-  simpleString,
   singleReference,
   urls,
   wikiData,
@@ -24,7 +24,8 @@ export class Artist extends Thing {
     name: name('Unnamed Artist'),
     directory: directory(),
     urls: urls(),
-    contextNotes: simpleString(),
+
+    contextNotes: contentString(),
 
     hasAvatar: flag(false),
     avatarFileExtension: fileExtension('jpg'),
diff --git a/src/data/things/flash.js b/src/data/things/flash.js
index 997f526e..85fe343e 100644
--- a/src/data/things/flash.js
+++ b/src/data/things/flash.js
@@ -15,13 +15,13 @@ import {withPropertyFromObject} from '#composite/data';
 
 import {
   color,
+  contentString,
   contributionList,
   directory,
   fileExtension,
   name,
   referenceList,
   simpleDate,
-  simpleString,
   urls,
   wikiData,
 } from '#composite/wiki-properties';
@@ -145,9 +145,9 @@ export class FlashAct extends Thing {
     name: name('Unnamed Flash Act'),
     directory: directory(),
     color: color(),
-    listTerminology: simpleString(),
+    listTerminology: contentString(),
 
-    jump: simpleString(),
+    jump: contentString(),
 
     jumpColor: {
       flags: {update: true, expose: true},
diff --git a/src/data/things/group.js b/src/data/things/group.js
index 75469bbd..38d169de 100644
--- a/src/data/things/group.js
+++ b/src/data/things/group.js
@@ -3,10 +3,10 @@ import find from '#find';
 
 import {
   color,
+  contentString,
   directory,
   name,
   referenceList,
-  simpleString,
   urls,
   wikiData,
 } from '#composite/wiki-properties';
@@ -22,7 +22,7 @@ export class Group extends Thing {
     name: name('Unnamed Group'),
     directory: directory(),
 
-    description: simpleString(),
+    description: contentString(),
 
     urls: urls(),
 
diff --git a/src/data/things/homepage-layout.js b/src/data/things/homepage-layout.js
index e390da19..dd6c1d9d 100644
--- a/src/data/things/homepage-layout.js
+++ b/src/data/things/homepage-layout.js
@@ -17,9 +17,9 @@ import {withResolvedReference} from '#composite/wiki-data';
 
 import {
   color,
+  contentString,
   name,
   referenceList,
-  simpleString,
   wikiData,
 } from '#composite/wiki-properties';
 
@@ -31,7 +31,7 @@ export class HomepageLayout extends Thing {
   static [Thing.getPropertyDescriptors] = ({HomepageLayoutRow}) => ({
     // Update & expose
 
-    sidebarContent: simpleString(),
+    sidebarContent: contentString(),
 
     navbarLinks: {
       flags: {update: true, expose: true},
diff --git a/src/data/things/news-entry.js b/src/data/things/news-entry.js
index 36da0299..f220b270 100644
--- a/src/data/things/news-entry.js
+++ b/src/data/things/news-entry.js
@@ -1,8 +1,8 @@
 import {
+  contentString,
   directory,
   name,
   simpleDate,
-  simpleString,
 } from '#composite/wiki-properties';
 
 import Thing from './thing.js';
@@ -18,7 +18,7 @@ export class NewsEntry extends Thing {
     directory: directory(),
     date: simpleDate(),
 
-    content: simpleString(),
+    content: contentString(),
 
     // Expose only
 
diff --git a/src/data/things/static-page.js b/src/data/things/static-page.js
index 8a3fd10e..d1cc5b26 100644
--- a/src/data/things/static-page.js
+++ b/src/data/things/static-page.js
@@ -1,6 +1,7 @@
 import {isName} from '#validators';
 
 import {
+  contentString,
   directory,
   name,
   simpleString,
@@ -28,7 +29,7 @@ export class StaticPage extends Thing {
     },
 
     directory: directory(),
-    content: simpleString(),
+    content: contentString(),
     stylesheet: simpleString(),
     script: simpleString(),
   });
diff --git a/src/data/things/track.js b/src/data/things/track.js
index e3fe0804..be3035cd 100644
--- a/src/data/things/track.js
+++ b/src/data/things/track.js
@@ -27,6 +27,7 @@ import {
   additionalNameList,
   commentary,
   commentatorArtists,
+  contentString,
   contributionList,
   directory,
   duration,
@@ -36,7 +37,6 @@ import {
   reverseReferenceList,
   simpleDate,
   singleReference,
-  simpleString,
   urls,
   wikiData,
 } from '#composite/wiki-properties';
@@ -153,7 +153,7 @@ export class Track extends Thing {
     ],
 
     commentary: commentary(),
-    lyrics: simpleString(),
+    lyrics: contentString(),
 
     additionalFiles: additionalFiles(),
     sheetMusicFiles: additionalFiles(),
diff --git a/src/data/things/wiki-info.js b/src/data/things/wiki-info.js
index 3db9727b..112d454f 100644
--- a/src/data/things/wiki-info.js
+++ b/src/data/things/wiki-info.js
@@ -3,10 +3,10 @@ import find from '#find';
 import {isColor, isLanguageCode, isName, isURL} from '#validators';
 
 import {
+  contentString,
   flag,
   name,
   referenceList,
-  simpleString,
   wikiData,
 } from '#composite/wiki-properties';
 
@@ -41,9 +41,9 @@ export class WikiInfo extends Thing {
     },
 
     // One-line description used for <meta rel="description"> tag.
-    description: simpleString(),
+    description: contentString(),
 
-    footerContent: simpleString(),
+    footerContent: contentString(),
 
     defaultLanguage: {
       flags: {update: true, expose: true},