diff --git a/sample/content/14298de4d9524.nwd b/sample/content/14298de4d9524.nwd
index 106f640e..af6c4e50 100644
--- a/sample/content/14298de4d9524.nwd
+++ b/sample/content/14298de4d9524.nwd
@@ -1,4 +1,4 @@
-%%~ 14298de4d9524:f7e2d9f330615:f6622b4617424:John Smith
+%%~ 14298de4d9524:f7e2d9f330615:f6622b4617424:CHARACTER:NOTE:John Smith
 # John Smith
 
 @tag: John
diff --git a/sample/content/53b69b83cdafc.nwd b/sample/content/53b69b83cdafc.nwd
index 51c7c8d9..b25ce403 100644
--- a/sample/content/53b69b83cdafc.nwd
+++ b/sample/content/53b69b83cdafc.nwd
@@ -1,4 +1,4 @@
-%%~ 53b69b83cdafc:7031beac91f75:Title Page
+%%~ 53b69b83cdafc:7031beac91f75:NOVEL:TITLE:Title Page
 # My Novel
 
 **By Jane Doh**
diff --git a/sample/content/5eaea4e8cdee8.nwd b/sample/content/5eaea4e8cdee8.nwd
index ac8ce5dd..ba951a2b 100644
--- a/sample/content/5eaea4e8cdee8.nwd
+++ b/sample/content/5eaea4e8cdee8.nwd
@@ -1,4 +1,4 @@
-%%~ 5eaea4e8cdee8:15c4492bd5107:Mars
+%%~ 5eaea4e8cdee8:15c4492bd5107:WORLD:NOTE:Mars
 # Mars
 
 @tag: Mars
diff --git a/sample/content/636b6aa9b697b.nwd b/sample/content/636b6aa9b697b.nwd
index ea69cd21..e93bbb57 100644
--- a/sample/content/636b6aa9b697b.nwd
+++ b/sample/content/636b6aa9b697b.nwd
@@ -1,4 +1,4 @@
-%%~ 636b6aa9b697b:e7ded148d6e4a:7031beac91f75:Making a Scene
+%%~ 636b6aa9b697b:e7ded148d6e4a:7031beac91f75:NOVEL:SCENE:Making a Scene
 ### Making a Scene
 
 @pov: Jane
diff --git a/sample/content/6a2d6d5f4f401.nwd b/sample/content/6a2d6d5f4f401.nwd
index 5e5d8566..583f503f 100644
--- a/sample/content/6a2d6d5f4f401.nwd
+++ b/sample/content/6a2d6d5f4f401.nwd
@@ -1,4 +1,4 @@
-%%~ 6a2d6d5f4f401:e7ded148d6e4a:7031beac91f75:Chapter One
+%%~ 6a2d6d5f4f401:e7ded148d6e4a:7031beac91f75:NOVEL:CHAPTER:Chapter One
 ## So it Begins
 
 @pov: Jane
diff --git a/sample/content/88706ddc78b1b.nwd b/sample/content/88706ddc78b1b.nwd
index 94b563cf..4f9a8d43 100644
--- a/sample/content/88706ddc78b1b.nwd
+++ b/sample/content/88706ddc78b1b.nwd
@@ -1,4 +1,4 @@
-%%~ 88706ddc78b1b:e7ded148d6e4a:7031beac91f75:Chapter Two
+%%~ 88706ddc78b1b:e7ded148d6e4a:7031beac91f75:NOVEL:CHAPTER:Chapter Two
 ## Where has John Gone?
 
 @pov: Jane
diff --git a/sample/content/96b68994dfa3d.nwd b/sample/content/96b68994dfa3d.nwd
index 29818dc1..6ab833fd 100644
--- a/sample/content/96b68994dfa3d.nwd
+++ b/sample/content/96b68994dfa3d.nwd
@@ -1,4 +1,4 @@
-%%~ 96b68994dfa3d:e7ded148d6e4a:7031beac91f75:A Note on Structure
+%%~ 96b68994dfa3d:e7ded148d6e4a:7031beac91f75:NOVEL:NOTE:A Note on Structure
 # A Note on Structure
 
 This file is just a note. You can save notes anywhere you like in the project tree. Notes can be filtered out when you export the project.
diff --git a/sample/content/974e400180a99.nwd b/sample/content/974e400180a99.nwd
index 303d5232..07ca7817 100644
--- a/sample/content/974e400180a99.nwd
+++ b/sample/content/974e400180a99.nwd
@@ -1,4 +1,4 @@
-%%~ 974e400180a99:7031beac91f75:Page
+%%~ 974e400180a99:7031beac91f75:NOVEL:PAGE:Page
 This is a plain page with some text on it.
 
 This file should receive no special formatting, but the text will always be left aligned and the content will always start on a fresh page when the project is exported.
diff --git a/sample/content/ae7339df26ded.nwd b/sample/content/ae7339df26ded.nwd
index 05ed60d5..ea4bb9ce 100644
--- a/sample/content/ae7339df26ded.nwd
+++ b/sample/content/ae7339df26ded.nwd
@@ -1,4 +1,4 @@
-%%~ ae7339df26ded:e7ded148d6e4a:7031beac91f75:We Found John!
+%%~ ae7339df26ded:e7ded148d6e4a:7031beac91f75:NOVEL:SCENE:We Found John!
 ### We Found John!
 
 @pov: John
diff --git a/sample/content/b3e74dbc1f584.nwd b/sample/content/b3e74dbc1f584.nwd
index 3f81b275..a7a8ba8a 100644
--- a/sample/content/b3e74dbc1f584.nwd
+++ b/sample/content/b3e74dbc1f584.nwd
@@ -1,4 +1,4 @@
-%%~ b3e74dbc1f584:15c4492bd5107:Earth
+%%~ b3e74dbc1f584:15c4492bd5107:WORLD:NOTE:Earth
 # Earth
 
 @tag: Earth
diff --git a/sample/content/b8136a5a774a0.nwd b/sample/content/b8136a5a774a0.nwd
index 4e63373d..8c6ddb77 100644
--- a/sample/content/b8136a5a774a0.nwd
+++ b/sample/content/b8136a5a774a0.nwd
@@ -1,4 +1,4 @@
-%%~ b8136a5a774a0:98acd8c76c93a:Delete Me!
+%%~ b8136a5a774a0:98acd8c76c93a:NOVEL:SCENE:Delete Me!
 ### Delete Me!
 
 This scene is trash.
\ No newline at end of file
diff --git a/sample/content/ba8a28a246524.nwd b/sample/content/ba8a28a246524.nwd
index b30cb63b..8cc5ae6c 100644
--- a/sample/content/ba8a28a246524.nwd
+++ b/sample/content/ba8a28a246524.nwd
@@ -1,4 +1,4 @@
-%%~ ba8a28a246524:e7ded148d6e4a:7031beac91f75:Interlude
+%%~ ba8a28a246524:e7ded148d6e4a:7031beac91f75:NOVEL:UNNUMBERED:Interlude
 ## Interlude
 
 % Notice that this is a file with the flag ‘N.Un’. The ‘N’ means it’s a novel file, and the ‘Un’ means it’s an unnumbered chapter. Unnumbered chapters can be treated separately from numbered chapters during export. Perfect for when you want to add an interlude, or for a prologue or epilogue.
diff --git a/sample/content/bb2c23b3c42cc.nwd b/sample/content/bb2c23b3c42cc.nwd
index 869118d7..126f549b 100644
--- a/sample/content/bb2c23b3c42cc.nwd
+++ b/sample/content/bb2c23b3c42cc.nwd
@@ -1,4 +1,4 @@
-%%~ bb2c23b3c42cc:f7e2d9f330615:f6622b4617424:Jane Smith
+%%~ bb2c23b3c42cc:f7e2d9f330615:f6622b4617424:CHARACTER:NOTE:Jane Smith
 # Jane Smith
 
 @tag: Jane
diff --git a/sample/content/bc0cbd2a407f3.nwd b/sample/content/bc0cbd2a407f3.nwd
index 1fe75e50..94b036c0 100644
--- a/sample/content/bc0cbd2a407f3.nwd
+++ b/sample/content/bc0cbd2a407f3.nwd
@@ -1,4 +1,4 @@
-%%~ bc0cbd2a407f3:e7ded148d6e4a:7031beac91f75:Another Scene
+%%~ bc0cbd2a407f3:e7ded148d6e4a:7031beac91f75:NOVEL:SCENE:Another Scene
 ### Another Scene
 
 @pov: John
diff --git a/sample/content/edca4be2fcaf8.nwd b/sample/content/edca4be2fcaf8.nwd
index 679e4e27..0200ab75 100644
--- a/sample/content/edca4be2fcaf8.nwd
+++ b/sample/content/edca4be2fcaf8.nwd
@@ -1,4 +1,4 @@
-%%~ edca4be2fcaf8:7031beac91f75:Part 1
+%%~ edca4be2fcaf8:7031beac91f75:NOVEL:PARTITION:Part One
 # Part One
 
 The first part.
\ No newline at end of file
diff --git a/sample/content/f1471bef9f2ae.nwd b/sample/content/f1471bef9f2ae.nwd
index 9b2d9368..32db9cb0 100644
--- a/sample/content/f1471bef9f2ae.nwd
+++ b/sample/content/f1471bef9f2ae.nwd
@@ -1,4 +1,4 @@
-%%~ f1471bef9f2ae:15c4492bd5107:Space
+%%~ f1471bef9f2ae:15c4492bd5107:WORLD:NOTE:Space
 # Space
 
 @tag: Space
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index 88ce6d2f..cee9b2fa 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,21 +1,21 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.8.0rc1" hexVersion="0x000800c1" fileVersion="1.1" timeStamp="2020-06-05 20:53:20">
+<novelWriterXML appVersion="0.9.0rc1" hexVersion="0x000900c1" fileVersion="1.1" timeStamp="2020-06-12 17:13:30">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>273</saveCount>
-    <autoCount>40</autoCount>
-    <editTime>4125</editTime>
+    <saveCount>280</saveCount>
+    <autoCount>41</autoCount>
+    <editTime>4312</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>
     <spellCheck>True</spellCheck>
     <autoOutline>True</autoOutline>
-    <lastEdited>636b6aa9b697b</lastEdited>
+    <lastEdited>bc0cbd2a407f3</lastEdited>
     <lastViewed>b3e74dbc1f584</lastViewed>
-    <lastWordCount>914</lastWordCount>
+    <lastWordCount>920</lastWordCount>
     <autoReplace>
       <A>B</A>
       <B>E</B>
@@ -117,7 +117,7 @@
       <charCount>1199</charCount>
       <wordCount>216</wordCount>
       <paraCount>7</paraCount>
-      <cursorPos>1266</cursorPos>
+      <cursorPos>950</cursorPos>
     </item>
     <item handle="bc0cbd2a407f3" order="2" parent="e7ded148d6e4a">
       <name>Another Scene</name>
@@ -274,9 +274,9 @@
       <status>New</status>
       <exported>True</exported>
       <layout>SCENE</layout>
-      <charCount>0</charCount>
-      <wordCount>0</wordCount>
-      <paraCount>0</paraCount>
+      <charCount>30</charCount>
+      <wordCount>6</wordCount>
+      <paraCount>1</paraCount>
       <cursorPos>36</cursorPos>
     </item>
   </content>