diff --git a/novelwriter/core/item.py b/novelwriter/core/item.py
index f6d93b36..e23b4fb9 100644
--- a/novelwriter/core/item.py
+++ b/novelwriter/core/item.py
@@ -160,13 +160,12 @@ class NWItem():
             itemAttrib["layout"] = str(self._layout.name)
 
         metaAttrib = {}
+        metaAttrib["expanded"] = str(self._expanded)
         if self._type == nwItemType.FILE:
             metaAttrib["charCount"] = str(self._charCount)
             metaAttrib["wordCount"] = str(self._wordCount)
             metaAttrib["paraCount"] = str(self._paraCount)
             metaAttrib["cursorPos"] = str(self._cursorPos)
-        else:
-            metaAttrib["expanded"]  = str(self._expanded)
 
         nameAttrib = {}
         nameAttrib["status"] = str(self._status)
@@ -409,6 +408,8 @@ class NWItem():
             self._type = value
         elif isItemType(value):
             self._type = nwItemType[value]
+        elif value == "TRASH":
+            self._type = nwItemType.ROOT
         else:
             logger.error("Unrecognised item type '%s'", value)
             self._type = nwItemType.NO_TYPE
diff --git a/novelwriter/core/project.py b/novelwriter/core/project.py
index 0d24d74c..26efb323 100644
--- a/novelwriter/core/project.py
+++ b/novelwriter/core/project.py
@@ -158,7 +158,7 @@ class NWProject():
         if trashHandle is None:
             newItem = NWItem(self)
             newItem.setName(trConst(nwLabels.CLASS_NAME[nwItemClass.TRASH]))
-            newItem.setType(nwItemType.TRASH)
+            newItem.setType(nwItemType.ROOT)
             newItem.setClass(nwItemClass.TRASH)
             self.projTree.append(None, None, newItem)
             self.projTree.updateItemData(newItem.itemHandle)
diff --git a/novelwriter/core/tree.py b/novelwriter/core/tree.py
index a158c37a..ee57e0db 100644
--- a/novelwriter/core/tree.py
+++ b/novelwriter/core/tree.py
@@ -100,14 +100,13 @@ class NWTree():
             if nwItem.itemClass == nwItemClass.ARCHIVE:
                 logger.verbose("Item '%s' is the archive folder", str(tHandle))
                 self._archRoot = tHandle
-
-        if nwItem.itemType == nwItemType.TRASH:
-            if self._trashRoot is None:
-                logger.verbose("Item '%s' is the trash folder", str(tHandle))
-                self._trashRoot = tHandle
-            else:
-                logger.error("Only one trash folder allowed")
-                return False
+            elif nwItem.itemClass == nwItemClass.TRASH:
+                if self._trashRoot is None:
+                    logger.verbose("Item '%s' is the trash folder", str(tHandle))
+                    self._trashRoot = tHandle
+                else:
+                    logger.error("Only one trash folder allowed")
+                    return False
 
         self._projTree[tHandle] = nwItem
         self._treeOrder.append(tHandle)
@@ -352,30 +351,6 @@ class NWTree():
 
         return True
 
-    ##
-    #  Getters
-    ##
-
-    def countTypes(self):
-        """Count the number of files, folders and roots in the project.
-        """
-        nRoot = 0
-        nFolder = 0
-        nFile = 0
-
-        for tHandle in self._treeOrder:
-            tItem = self.__getitem__(tHandle)
-            if tItem is None:
-                continue
-            elif tItem.itemType == nwItemType.ROOT:
-                nRoot += 1
-            elif tItem.itemType == nwItemType.FOLDER:
-                nFolder += 1
-            elif tItem.itemType == nwItemType.FILE:
-                nFile += 1
-
-        return nRoot, nFolder, nFile
-
     ##
     #  Meta Methods
     ##
diff --git a/novelwriter/enum.py b/novelwriter/enum.py
index 3360d8c5..56340541 100644
--- a/novelwriter/enum.py
+++ b/novelwriter/enum.py
@@ -32,7 +32,6 @@ class nwItemType(Enum):
     ROOT    = 1
     FOLDER  = 2
     FILE    = 3
-    TRASH   = 4
 
 # END Enum nwItemType
 
diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py
index 23238b84..cb59c9ee 100644
--- a/novelwriter/gui/projtree.py
+++ b/novelwriter/gui/projtree.py
@@ -82,7 +82,7 @@ class GuiProjectTree(QTreeWidget):
         # Tree Settings
         iPx = self.theTheme.baseIconSize
         self.setIconSize(QSize(iPx, iPx))
-        self.setExpandsOnDoubleClick(True)
+        self.setExpandsOnDoubleClick(False)
         self.setIndentation(iPx)
         self.setColumnCount(4)
         self.setHeaderLabels([
@@ -349,6 +349,14 @@ class GuiProjectTree(QTreeWidget):
             theList = self._scanChildren(theList, theItem, 0)
         return theList
 
+    def toggleExpanded(self, tHandle):
+        """Expand an item based on its handle.
+        """
+        trItem = self._getTreeItem(tHandle)
+        if trItem is not None:
+            trItem.setExpanded(not trItem.isExpanded())
+        return
+
     def getColumnSizes(self):
         """Return the column widths for the tree columns.
         """
@@ -435,7 +443,7 @@ class GuiProjectTree(QTreeWidget):
             logger.error("Could not find tree item for deletion")
             return False
 
-        wCount = int(trItemS.data(self.C_COUNT, Qt.UserRole))
+        wCount = self._getItemWordCount(tHandle)
         if nwItemS.itemType == nwItemType.FILE:
             logger.debug("User requested file '%s' deleted", tHandle)
             trItemP = trItemS.parent()
@@ -576,7 +584,7 @@ class GuiProjectTree(QTreeWidget):
 
         return
 
-    def propagateCount(self, tHandle, theCount):
+    def propagateCount(self, tHandle, newCount, countChildren=False):
         """Recursive function setting the word count for a given item,
         and propagating that count upwards in the tree until reaching a
         root item. This function is more efficient than recalculating
@@ -588,8 +596,12 @@ class GuiProjectTree(QTreeWidget):
         if tItem is None:
             return
 
-        tItem.setText(self.C_COUNT, f"{theCount:n}")
-        tItem.setData(self.C_COUNT, Qt.UserRole, int(theCount))
+        if countChildren:
+            for i in range(tItem.childCount()):
+                newCount += int(tItem.child(i).data(self.C_COUNT, Qt.UserRole))
+
+        tItem.setText(self.C_COUNT, f"{newCount:n}")
+        tItem.setData(self.C_COUNT, Qt.UserRole, int(newCount))
 
         pItem = tItem.parent()
         if pItem is None:
@@ -602,7 +614,12 @@ class GuiProjectTree(QTreeWidget):
             pHandle = pItem.data(self.C_NAME, Qt.UserRole)
 
         if pHandle:
-            self.propagateCount(pHandle, pCount)
+            if self.theProject.projTree.checkType(pHandle, nwItemType.FILE):
+                # A file has an internal word count we need to account
+                # for, but a folder always has 0 words on its own.
+                pCount += self.theIndex.getCounts(pHandle)[1]
+
+            self.propagateCount(pHandle, pCount, countChildren=False)
 
         return
 
@@ -646,11 +663,11 @@ class GuiProjectTree(QTreeWidget):
             return False
 
         dstIndex = min(max(0, dstIndex), dstItem.childCount())
-        wCount = int(srcItem.data(self.C_COUNT, Qt.UserRole))
         sHandle = srcItem.data(self.C_NAME, Qt.UserRole)
         dHandle = dstItem.data(self.C_NAME, Qt.UserRole)
         logger.debug("Moving item '%s' back to '%s', index %d", sHandle, dHandle, dstIndex)
 
+        wCount = self._getItemWordCount(sHandle)
         self.propagateCount(sHandle, 0)
         parItem = srcItem.parent()
         srcIndex = parItem.indexOfChild(srcItem)
@@ -724,7 +741,7 @@ class GuiProjectTree(QTreeWidget):
     def doUpdateCounts(self, tHandle, cCount, wCount, pCount):
         """Slot for updating the word count of a specific item.
         """
-        self.propagateCount(tHandle, wCount)
+        self.propagateCount(tHandle, wCount, countChildren=True)
         self.wordCountsChanged.emit()
         return
 
@@ -765,61 +782,28 @@ class GuiProjectTree(QTreeWidget):
         """
         sHandle = self.getSelectedHandle()
         if sHandle is None:
-            logger.error("No handle selected")
+            logger.error("Invalid drag and drop event")
             return
 
-        dIndex = self.indexAt(theEvent.pos())
-        if not dIndex.isValid():
-            logger.error("Invalid drop index")
-            return
+        logger.debug("Drag'n'drop of item '%s' accepted", sHandle)
 
         sItem = self._getTreeItem(sHandle)
-        dItem = self.itemFromIndex(dIndex)
-        dHandle = dItem.data(self.C_NAME, Qt.UserRole)
-        snItem = self.theProject.projTree[sHandle]
-        dnItem = self.theProject.projTree[dHandle]
-        if dnItem is None:
-            self.theParent.makeAlert(self.tr(
-                "The item cannot be moved to that location."
-            ), nwAlert.ERROR)
-            return
+        isExpanded = False
+        if sItem is not None:
+            isExpanded = sItem.isExpanded()
 
         pItem = sItem.parent()
         pIndex = 0
         if pItem is not None:
             pIndex = pItem.indexOfChild(sItem)
 
-        # Determine if the drag and drop is allowed:
-        # - Files can be moved anywhere
-        # - Folders can only be moved within the same root folder
-        # - Root folders cannot be moved at all
-        # - Items cannot be dropped on top of a file (moved inside)
+        wCount = self._getItemWordCount(sHandle)
+        self.propagateCount(sHandle, 0)
 
-        isFile = snItem.itemType == nwItemType.FILE
-        isRoot = snItem.itemType == nwItemType.ROOT
-        onFile = dnItem.itemType == nwItemType.FILE
-        inSame = snItem.itemRoot == dnItem.itemRoot
-
-        allowDrop  = inSame or isFile
-        allowDrop &= not (self.dropIndicatorPosition() == QAbstractItemView.OnItem and onFile)
-
-        if allowDrop and not isRoot:
-            logger.debug("Drag'n'drop of item '%s' accepted", sHandle)
-
-            wCount = int(sItem.data(self.C_COUNT, Qt.UserRole))
-            self.propagateCount(sHandle, 0)
-
-            QTreeWidget.dropEvent(self, theEvent)
-            self._postItemMove(sHandle, wCount)
-            self._recordLastMove(sItem, pItem, pIndex)
-
-        else:
-            logger.debug("Drag'n'drop of item '%s' not accepted", sHandle)
-
-            theEvent.ignore()
-            self.theParent.makeAlert(self.tr(
-                "The item cannot be moved to that location."
-            ), nwAlert.ERROR)
+        QTreeWidget.dropEvent(self, theEvent)
+        self._postItemMove(sHandle, wCount)
+        self._recordLastMove(sItem, pItem, pIndex)
+        sItem.setExpanded(isExpanded)
 
         return
 
@@ -841,28 +825,40 @@ class GuiProjectTree(QTreeWidget):
         # is updated accordingly, and update word count
         pHandle = trItemP.data(self.C_NAME, Qt.UserRole)
         nwItemS.setParent(pHandle)
-        self.theProject.projTree.updateItemData(tHandle)
-        self.setTreeItemValues(tHandle)
-        self.propagateCount(tHandle, wCount)
-
+        trItemP.setExpanded(True)
         logger.debug("The parent of item '%s' has been changed to '%s'", tHandle, pHandle)
 
-        # The items dropped into archive or trash should be removed
-        # from the project index, for all other items, we rescan the
-        # file to ensure the index is up to date.
-        if nwItemS.isInactive():
-            self.theIndex.deleteHandle(tHandle)
-        else:
-            self.theIndex.reIndexHandle(tHandle)
+        mHandles = self.getTreeFromHandle(tHandle)
+        logger.debug("A total of %d item(s) were moved", len(mHandles))
+        for mHandle in mHandles:
+            logger.debug("Updating item '%s'", mHandle)
+            self.theProject.projTree.updateItemData(mHandle)
+
+            # Update the index
+            if nwItemS.isInactive():
+                self.theIndex.deleteHandle(mHandle)
+            else:
+                self.theIndex.reIndexHandle(mHandle)
+
+            self.setTreeItemValues(mHandle)
 
         # Trigger dependent updates
+        self.propagateCount(tHandle, wCount)
         self._setTreeChanged(True)
         self._emitItemChange(tHandle)
 
         return True
 
+    def _getItemWordCount(self, tHandle):
+        """Retrun the word count of a given item handle.
+        """
+        tItem = self._getTreeItem(tHandle)
+        if tItem is None:
+            return 0
+        return int(tItem.data(self.C_COUNT, Qt.UserRole))
+
     def _getTreeItem(self, tHandle):
-        """Returns the QTreeWidgetItem of a given item handle.
+        """Return the QTreeWidgetItem of a given item handle.
         """
         return self._treeMap.get(tHandle, None)
 
@@ -878,12 +874,17 @@ class GuiProjectTree(QTreeWidget):
         starting at a given QTreeWidgetItem.
         """
         tHandle = tItem.data(self.C_NAME, Qt.UserRole)
+        cCount = tItem.childCount()
+
+        # Update tree-related meta data
         nwItem = self.theProject.projTree[tHandle]
-        nwItem.setExpanded(tItem.isExpanded())
+        nwItem.setExpanded(tItem.isExpanded() and cCount > 0)
         nwItem.setOrder(tIndex)
+
         theList.append(tHandle)
-        for i in range(tItem.childCount()):
+        for i in range(cCount):
             self._scanChildren(theList, tItem.child(i), i)
+
         return theList
 
     def _addTreeItem(self, nwItem, nHandle=None):
@@ -910,8 +911,7 @@ class GuiProjectTree(QTreeWidget):
         self._treeMap[tHandle] = newItem
         if pHandle is None:
             if nwItem.itemType == nwItemType.ROOT:
-                self.addTopLevelItem(newItem)
-            elif nwItem.itemType == nwItemType.TRASH:
+                newItem.setFlags(newItem.flags() ^ Qt.ItemIsDragEnabled)
                 self.addTopLevelItem(newItem)
             else:
                 self.theParent.makeAlert(self.tr(
@@ -931,7 +931,7 @@ class GuiProjectTree(QTreeWidget):
                 self._treeMap[pHandle].insertChild(byIndex+1, newItem)
             else:
                 self._treeMap[pHandle].addChild(newItem)
-            self.propagateCount(tHandle, nwItem.wordCount)
+            self.propagateCount(tHandle, nwItem.wordCount, countChildren=True)
 
         self.setTreeItemValues(tHandle)
         newItem.setExpanded(nwItem.isExpanded)
@@ -1057,7 +1057,7 @@ class GuiProjectTreeMenu(QMenu):
 
         trashHandle = self.theTree.theProject.projTree.trashRoot()
 
-        inTrash = theItem.itemParent == trashHandle and trashHandle is not None
+        inTrash = self.theTree.theProject.projTree.isTrash(theItem.itemHandle)
         isTrash = theItem.itemHandle == trashHandle and trashHandle is not None
         isFile = theItem.itemType == nwItemType.FILE
 
diff --git a/novelwriter/gui/theme.py b/novelwriter/gui/theme.py
index 3c180b50..19fe823a 100644
--- a/novelwriter/gui/theme.py
+++ b/novelwriter/gui/theme.py
@@ -639,9 +639,6 @@ class GuiIcons:
                     iconName = "proj_scene"
             elif tLayout == nwItemLayout.NOTE:
                 iconName = "proj_note"
-        elif tType == nwItemType.TRASH:
-            iconName = nwLabels.CLASS_ICON[tClass]
-
         if iconName is None:
             return QIcon()
 
diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py
index fabd3867..60fe0d23 100644
--- a/novelwriter/guimain.py
+++ b/novelwriter/guimain.py
@@ -906,7 +906,7 @@ class GuiMain(QMainWindow):
                 tItem.setCharCount(cC)
                 tItem.setWordCount(wC)
                 tItem.setParaCount(pC)
-                self.treeView.propagateCount(tItem.itemHandle, wC)
+                self.treeView.propagateCount(tItem.itemHandle, wC, countChildren=True)
                 self.treeView.setTreeItemValues(tItem.itemHandle)
 
         tEnd = time()
@@ -1568,11 +1568,17 @@ class GuiMain(QMainWindow):
     @pyqtSlot("QTreeWidgetItem*", int)
     def _treeDoubleClick(self, tItem, colNo):
         """The user double-clicked an item in the tree. If it is a file,
-        we open it. Otherwise, we do nothing.
+        we open it. Otherwise, we toggle the expanded status.
         """
         tHandle = self.treeView.getSelectedHandle()
         if tHandle is not None:
-            self.openDocument(tHandle, changeFocus=False, doScroll=False)
+            tItem = self.theProject.projTree[tHandle]
+            if tItem is None:
+                return
+            if tItem.itemType == nwItemType.FILE:
+                self.openDocument(tHandle, changeFocus=False, doScroll=False)
+            else:
+                self.treeView.toggleExpanded(tHandle)
         return
 
     @pyqtSlot()
diff --git a/sample/content/636b6aa9b697b.nwd b/sample/content/636b6aa9b697b.nwd
index 8fe96042..2927b7d0 100644
--- a/sample/content/636b6aa9b697b.nwd
+++ b/sample/content/636b6aa9b697b.nwd
@@ -1,5 +1,5 @@
 %%~name: Making a Scene
-%%~path: e7ded148d6e4a/636b6aa9b697b
+%%~path: 6a2d6d5f4f401/636b6aa9b697b
 %%~kind: NOVEL/DOCUMENT
 ### Making a Scene
 
diff --git a/sample/content/ae7339df26ded.nwd b/sample/content/ae7339df26ded.nwd
index 9b135713..1eb7a65d 100644
--- a/sample/content/ae7339df26ded.nwd
+++ b/sample/content/ae7339df26ded.nwd
@@ -1,5 +1,5 @@
 %%~name: We Found John!
-%%~path: e7ded148d6e4a/ae7339df26ded
+%%~path: 88706ddc78b1b/ae7339df26ded
 %%~kind: NOVEL/DOCUMENT
 ### We Found John!
 
diff --git a/sample/content/bc0cbd2a407f3.nwd b/sample/content/bc0cbd2a407f3.nwd
index 3c95e8ff..4ebbca1d 100644
--- a/sample/content/bc0cbd2a407f3.nwd
+++ b/sample/content/bc0cbd2a407f3.nwd
@@ -1,5 +1,5 @@
 %%~name: Another Scene
-%%~path: e7ded148d6e4a/bc0cbd2a407f3
+%%~path: 6a2d6d5f4f401/bc0cbd2a407f3
 %%~kind: NOVEL/DOCUMENT
 ### Another Scene
 
diff --git a/sample/nwProject.nwx b/sample/nwProject.nwx
index 23660870..406fa423 100644
--- a/sample/nwProject.nwx
+++ b/sample/nwProject.nwx
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-17 19:05:24">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 19:31:12">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>
     <author>Jane Smith</author>
     <author>Jay Doh</author>
-    <saveCount>1306</saveCount>
-    <autoCount>199</autoCount>
-    <editTime>65149</editTime>
+    <saveCount>1327</saveCount>
+    <autoCount>207</autoCount>
+    <editTime>66285</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>
@@ -54,15 +54,15 @@
       <name status="sc24b8f" import="ia857f0">Novel</name>
     </item>
     <item handle="53b69b83cdafc" parent="7031beac91f75" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="93" wordCount="19" paraCount="2" cursorPos="2"/>
+      <meta expanded="False" charCount="93" wordCount="19" paraCount="2" cursorPos="2"/>
       <name status="sc24b8f" import="ia857f0" exported="True">Title Page</name>
     </item>
     <item handle="974e400180a99" parent="7031beac91f75" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="186" wordCount="39" paraCount="2" cursorPos="212"/>
+      <meta expanded="False" charCount="186" wordCount="39" paraCount="2" cursorPos="212"/>
       <name status="sf12341" import="ia857f0" exported="True">Page</name>
     </item>
     <item handle="edca4be2fcaf8" parent="7031beac91f75" root="7031beac91f75" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="26" wordCount="6" paraCount="1" cursorPos="33"/>
+      <meta expanded="False" charCount="26" wordCount="6" paraCount="1" cursorPos="33"/>
       <name status="sf12341" import="ia857f0" exported="True">Part One</name>
     </item>
     <item handle="e7ded148d6e4a" parent="7031beac91f75" root="7031beac91f75" order="3" type="FOLDER" class="NOVEL">
@@ -70,31 +70,31 @@
       <name status="s90e6c9" import="ia857f0">A Folder</name>
     </item>
     <item handle="6a2d6d5f4f401" parent="e7ded148d6e4a" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="75" wordCount="14" paraCount="1" cursorPos="279"/>
+      <meta expanded="True" charCount="75" wordCount="14" paraCount="1" cursorPos="279"/>
       <name status="sf24ce6" import="ia857f0" exported="True">Chapter One</name>
     </item>
-    <item handle="636b6aa9b697b" parent="e7ded148d6e4a" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="2429" wordCount="432" paraCount="14" cursorPos="219"/>
+    <item handle="636b6aa9b697b" parent="6a2d6d5f4f401" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="False" charCount="2429" wordCount="432" paraCount="14" cursorPos="1479"/>
       <name status="s90e6c9" import="ia857f0" exported="True">Making a Scene</name>
     </item>
-    <item handle="bc0cbd2a407f3" parent="e7ded148d6e4a" root="7031beac91f75" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="476" wordCount="93" paraCount="3" cursorPos="577"/>
+    <item handle="bc0cbd2a407f3" parent="6a2d6d5f4f401" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="False" charCount="476" wordCount="93" paraCount="3" cursorPos="577"/>
       <name status="s90e6c9" import="ia857f0" exported="True">Another Scene</name>
     </item>
-    <item handle="ba8a28a246524" parent="e7ded148d6e4a" root="7031beac91f75" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="617" wordCount="101" paraCount="3" cursorPos="4"/>
+    <item handle="ba8a28a246524" parent="e7ded148d6e4a" root="7031beac91f75" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="False" charCount="617" wordCount="101" paraCount="3" cursorPos="4"/>
       <name status="sf12341" import="ia857f0" exported="True">Interlude</name>
     </item>
-    <item handle="96b68994dfa3d" parent="e7ded148d6e4a" root="7031beac91f75" order="4" type="FILE" class="NOVEL" layout="NOTE">
-      <meta charCount="1692" wordCount="313" paraCount="6" cursorPos="1110"/>
+    <item handle="96b68994dfa3d" parent="e7ded148d6e4a" root="7031beac91f75" order="2" type="FILE" class="NOVEL" layout="NOTE">
+      <meta expanded="False" charCount="1692" wordCount="313" paraCount="6" cursorPos="1110"/>
       <name status="sd51c5b" import="ia857f0" exported="False">A Note on Structure</name>
     </item>
-    <item handle="88706ddc78b1b" parent="e7ded148d6e4a" root="7031beac91f75" order="5" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="139" wordCount="28" paraCount="1" cursorPos="343"/>
+    <item handle="88706ddc78b1b" parent="e7ded148d6e4a" root="7031beac91f75" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="True" charCount="139" wordCount="28" paraCount="1" cursorPos="343"/>
       <name status="s90e6c9" import="ia857f0" exported="True">Chapter Two</name>
     </item>
-    <item handle="ae7339df26ded" parent="e7ded148d6e4a" root="7031beac91f75" order="6" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="189" wordCount="37" paraCount="1" cursorPos="224"/>
+    <item handle="ae7339df26ded" parent="88706ddc78b1b" root="7031beac91f75" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
+      <meta expanded="False" charCount="189" wordCount="37" paraCount="1" cursorPos="224"/>
       <name status="s90e6c9" import="ia857f0" exported="True">We Found John!</name>
     </item>
     <item handle="f6622b4617424" parent="None" root="f6622b4617424" order="1" type="ROOT" class="CHARACTER">
@@ -106,11 +106,11 @@
       <name status="sf12341" import="ia857f0">Main Characters</name>
     </item>
     <item handle="14298de4d9524" parent="f7e2d9f330615" root="f6622b4617424" order="0" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta charCount="49" wordCount="9" paraCount="1" cursorPos="24"/>
+      <meta expanded="False" charCount="49" wordCount="9" paraCount="1" cursorPos="24"/>
       <name status="sf12341" import="icfb3a5" exported="True">John Smith</name>
     </item>
     <item handle="bb2c23b3c42cc" parent="f7e2d9f330615" root="f6622b4617424" order="1" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta charCount="55" wordCount="9" paraCount="1" cursorPos="25"/>
+      <meta expanded="False" charCount="55" wordCount="9" paraCount="1" cursorPos="25"/>
       <name status="sf12341" import="i2d7a54" exported="True">Jane Smith</name>
     </item>
     <item handle="15c4492bd5107" parent="None" root="15c4492bd5107" order="2" type="ROOT" class="WORLD">
@@ -118,15 +118,15 @@
       <name status="sf12341" import="ia857f0">Locations</name>
     </item>
     <item handle="b3e74dbc1f584" parent="15c4492bd5107" root="15c4492bd5107" order="0" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="76" wordCount="15" paraCount="1" cursorPos="20"/>
+      <meta expanded="False" charCount="76" wordCount="15" paraCount="1" cursorPos="20"/>
       <name status="sf12341" import="i56be10" exported="True">Earth</name>
     </item>
     <item handle="f1471bef9f2ae" parent="15c4492bd5107" root="15c4492bd5107" order="1" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="115" wordCount="24" paraCount="1" cursorPos="133"/>
+      <meta expanded="False" charCount="115" wordCount="24" paraCount="1" cursorPos="133"/>
       <name status="sf12341" import="icfb3a5" exported="True">Space</name>
     </item>
     <item handle="5eaea4e8cdee8" parent="15c4492bd5107" root="15c4492bd5107" order="2" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="28" wordCount="6" paraCount="1" cursorPos="45"/>
+      <meta expanded="False" charCount="28" wordCount="6" paraCount="1" cursorPos="45"/>
       <name status="sf12341" import="i2d7a54" exported="True">Mars</name>
     </item>
     <item handle="6827118336ac1" parent="None" root="6827118336ac1" order="3" type="ROOT" class="ARCHIVE">
@@ -138,15 +138,15 @@
       <name status="sf12341" import="ia857f0">Scenes</name>
     </item>
     <item handle="8a5deb88c0e97" parent="ae9bf3c3ea159" root="6827118336ac1" order="0" type="FILE" class="ARCHIVE" layout="DOCUMENT">
-      <meta charCount="315" wordCount="55" paraCount="1" cursorPos="322"/>
+      <meta expanded="False" charCount="314" wordCount="55" paraCount="1" cursorPos="322"/>
       <name status="s90e6c9" import="ia857f0" exported="True">Old File</name>
     </item>
-    <item handle="98acd8c76c93a" parent="None" root="98acd8c76c93a" order="4" type="TRASH" class="TRASH">
+    <item handle="98acd8c76c93a" parent="None" root="98acd8c76c93a" order="4" type="ROOT" class="TRASH">
       <meta expanded="True"/>
       <name status="sf12341" import="ia857f0">Trash</name>
     </item>
     <item handle="b8136a5a774a0" parent="98acd8c76c93a" root="98acd8c76c93a" order="0" type="FILE" class="TRASH" layout="DOCUMENT">
-      <meta charCount="30" wordCount="6" paraCount="1" cursorPos="36"/>
+      <meta expanded="False" charCount="30" wordCount="6" paraCount="1" cursorPos="36"/>
       <name status="sf12341" import="ia857f0" exported="True">Delete Me!</name>
     </item>
   </content>
diff --git a/tests/conftest.py b/tests/conftest.py
index c6634f7c..769f855c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -164,9 +164,7 @@ def nwGUI(qtbot, monkeypatch, fncDir, fncConf):
     """
     monkeypatch.setattr(QMessageBox, "warning", lambda *a: QMessageBox.Yes)
     monkeypatch.setattr("novelwriter.CONFIG", fncConf)
-    nwGUI = novelwriter.main(
-        ["--testmode", "--info", "--config=%s" % fncDir, "--data=%s" % fncDir]
-    )
+    nwGUI = novelwriter.main(["--testmode", "--config=%s" % fncDir, "--data=%s" % fncDir])
     qtbot.addWidget(nwGUI)
     nwGUI.show()
     qtbot.wait(20)
diff --git a/tests/lipsum/nwProject.nwx b/tests/lipsum/nwProject.nwx
index d8d7a49e..02e3df49 100644
--- a/tests/lipsum/nwProject.nwx
+++ b/tests/lipsum/nwProject.nwx
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-16 14:19:39">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:13">
   <project>
     <name>Lorem Ipsum</name>
     <title>Lorem Ipsum</title>
     <author>lipsum.com</author>
-    <saveCount>24</saveCount>
+    <saveCount>26</saveCount>
     <autoCount>24</autoCount>
-    <editTime>1856</editTime>
+    <editTime>1863</editTime>
   </project>
   <settings>
     <doBackup>False</doBackup>
@@ -49,19 +49,19 @@
       <name status="sbaa94f" import="i613591">Novel</name>
     </item>
     <item handle="7a992350f3eb6" parent="b3643d0f92e32" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="230" wordCount="40" paraCount="3" cursorPos="148"/>
+      <meta expanded="False" charCount="230" wordCount="40" paraCount="3" cursorPos="148"/>
       <name status="sedd043" import="i613591" exported="True">Lorem Ipsum</name>
     </item>
     <item handle="8c58a65414c23" parent="b3643d0f92e32" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="1058" wordCount="176" paraCount="2" cursorPos="43"/>
+      <meta expanded="False" charCount="1058" wordCount="176" paraCount="2" cursorPos="43"/>
       <name status="sedd043" import="i613591" exported="True">Front Matter</name>
     </item>
     <item handle="88d59a277361b" parent="b3643d0f92e32" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="584" wordCount="92" paraCount="1" cursorPos="4"/>
+      <meta expanded="False" charCount="584" wordCount="92" paraCount="1" cursorPos="4"/>
       <name status="s92a87b" import="i613591" exported="True">Prologue</name>
     </item>
     <item handle="db7e733775d4d" parent="b3643d0f92e32" root="b3643d0f92e32" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="35" wordCount="6" paraCount="1" cursorPos="42"/>
+      <meta expanded="False" charCount="35" wordCount="6" paraCount="1" cursorPos="42"/>
       <name status="sbaa94f" import="i613591" exported="True">Act One</name>
     </item>
     <item handle="45e6b01ca35c1" parent="b3643d0f92e32" root="b3643d0f92e32" order="4" type="FOLDER" class="NOVEL">
@@ -69,19 +69,19 @@
       <name status="s92a87b" import="i613591">Chapter One</name>
     </item>
     <item handle="fb609cd8319dc" parent="45e6b01ca35c1" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="419" wordCount="67" paraCount="1" cursorPos="56"/>
+      <meta expanded="False" charCount="419" wordCount="67" paraCount="1" cursorPos="56"/>
       <name status="s92a87b" import="i613591" exported="True">Chapter One</name>
     </item>
     <item handle="88243afbe5ed8" parent="45e6b01ca35c1" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="2758" wordCount="404" paraCount="4" cursorPos="1528"/>
+      <meta expanded="False" charCount="2758" wordCount="404" paraCount="4" cursorPos="1528"/>
       <name status="sedd043" import="i613591" exported="True">Scene One</name>
     </item>
     <item handle="f96ec11c6a3da" parent="45e6b01ca35c1" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="4043" wordCount="600" paraCount="6" cursorPos="2335"/>
+      <meta expanded="False" charCount="4043" wordCount="600" paraCount="6" cursorPos="2335"/>
       <name status="sedd043" import="i613591" exported="True">Scene Two</name>
     </item>
     <item handle="846352075de7d" parent="b3643d0f92e32" root="b3643d0f92e32" order="5" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="631" wordCount="109" paraCount="3" cursorPos="376"/>
+      <meta expanded="False" charCount="631" wordCount="109" paraCount="3" cursorPos="376"/>
       <name status="sbaa94f" import="i613591" exported="False">Interlude</name>
     </item>
     <item handle="6bd935d2490cd" parent="b3643d0f92e32" root="b3643d0f92e32" order="6" type="FOLDER" class="NOVEL">
@@ -89,19 +89,19 @@
       <name status="s92a87b" import="i613591">Chapter Two</name>
     </item>
     <item handle="441420a886d82" parent="6bd935d2490cd" root="b3643d0f92e32" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="477" wordCount="70" paraCount="1" cursorPos="56"/>
+      <meta expanded="False" charCount="477" wordCount="70" paraCount="1" cursorPos="56"/>
       <name status="s92a87b" import="i613591" exported="True">Chapter Two</name>
     </item>
     <item handle="eb103bc70c90c" parent="6bd935d2490cd" root="b3643d0f92e32" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="3006" wordCount="439" paraCount="4" cursorPos="57"/>
+      <meta expanded="False" charCount="3006" wordCount="439" paraCount="4" cursorPos="57"/>
       <name status="sedd043" import="i613591" exported="True">Scene Three</name>
     </item>
     <item handle="f8c0562e50f1b" parent="6bd935d2490cd" root="b3643d0f92e32" order="2" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="3839" wordCount="563" paraCount="6" cursorPos="56"/>
+      <meta expanded="False" charCount="3839" wordCount="563" paraCount="6" cursorPos="56"/>
       <name status="sedd043" import="i613591" exported="True">Scene Four</name>
     </item>
     <item handle="47666c91c7ccf" parent="6bd935d2490cd" root="b3643d0f92e32" order="3" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="3644" wordCount="543" paraCount="5" cursorPos="351"/>
+      <meta expanded="False" charCount="3644" wordCount="543" paraCount="5" cursorPos="351"/>
       <name status="sedd043" import="i613591" exported="True">Scene Five</name>
     </item>
     <item handle="67a8707f2f249" parent="None" root="67a8707f2f249" order="1" type="ROOT" class="CHARACTER">
@@ -109,7 +109,7 @@
       <name status="sbaa94f" import="i613591">Characters</name>
     </item>
     <item handle="4c4f28287af27" parent="67a8707f2f249" root="67a8707f2f249" order="0" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta charCount="1864" wordCount="284" paraCount="3" cursorPos="1883"/>
+      <meta expanded="False" charCount="1864" wordCount="284" paraCount="3" cursorPos="1883"/>
       <name status="sbaa94f" import="i613591" exported="True">Mr. Nobody</name>
     </item>
     <item handle="6c6afb1247750" parent="None" root="6c6afb1247750" order="2" type="ROOT" class="PLOT">
@@ -117,7 +117,7 @@
       <name status="sbaa94f" import="i613591">Plot</name>
     </item>
     <item handle="2426c6f0ca922" parent="6c6afb1247750" root="6c6afb1247750" order="0" type="FILE" class="PLOT" layout="NOTE">
-      <meta charCount="1369" wordCount="195" paraCount="2" cursorPos="1387"/>
+      <meta expanded="False" charCount="1369" wordCount="195" paraCount="2" cursorPos="1387"/>
       <name status="sbaa94f" import="i613591" exported="True">Main</name>
     </item>
     <item handle="60bdf227455cc" parent="None" root="60bdf227455cc" order="3" type="ROOT" class="WORLD">
@@ -125,7 +125,7 @@
       <name status="sbaa94f" import="i613591">World</name>
     </item>
     <item handle="04468803b92e1" parent="60bdf227455cc" root="60bdf227455cc" order="0" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="1770" wordCount="259" paraCount="3" cursorPos="1792"/>
+      <meta expanded="False" charCount="1770" wordCount="259" paraCount="3" cursorPos="1792"/>
       <name status="sbaa94f" import="i613591" exported="True">Ancient Europe</name>
     </item>
   </content>
diff --git a/tests/minimal/nwProject.nwx b/tests/minimal/nwProject.nwx
index 6945dc08..af7595a4 100644
--- a/tests/minimal/nwProject.nwx
+++ b/tests/minimal/nwProject.nwx
@@ -1,13 +1,13 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-16 14:19:35">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:21">
   <project>
     <name>Test Minimal</name>
     <title>Minimal</title>
     <author>Jane Doe</author>
     <author>John Doh</author>
-    <saveCount>15</saveCount>
+    <saveCount>17</saveCount>
     <autoCount>2</autoCount>
-    <editTime>146</editTime>
+    <editTime>150</editTime>
   </project>
   <settings>
     <doBackup>True</doBackup>
@@ -47,7 +47,7 @@
       <name status="s72322d" import="iffcacb">Novel</name>
     </item>
     <item handle="a35baf2e93843" parent="a508bb932959c" root="a508bb932959c" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="28" wordCount="6" paraCount="1" cursorPos="33"/>
+      <meta expanded="False" charCount="28" wordCount="6" paraCount="1" cursorPos="33"/>
       <name status="s72322d" import="iffcacb" exported="True">Title Page</name>
     </item>
     <item handle="a6d311a93600a" parent="a508bb932959c" root="a508bb932959c" order="1" type="FOLDER" class="NOVEL">
@@ -55,11 +55,11 @@
       <name status="s72322d" import="iffcacb">New Chapter</name>
     </item>
     <item handle="f5ab3e30151e1" parent="a6d311a93600a" root="a508bb932959c" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="16"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="16"/>
       <name status="s72322d" import="iffcacb" exported="True">New Chapter</name>
     </item>
     <item handle="8c659a11cd429" parent="a6d311a93600a" root="a508bb932959c" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="9" wordCount="2" paraCount="0" cursorPos="15"/>
+      <meta expanded="False" charCount="9" wordCount="2" paraCount="0" cursorPos="15"/>
       <name status="s72322d" import="iffcacb" exported="True">New Scene</name>
     </item>
     <item handle="7695ce551d265" parent="None" root="7695ce551d265" order="1" type="ROOT" class="PLOT">
diff --git a/tests/reference/coreProject_NewCustomA_nwProject.nwx b/tests/reference/coreProject_NewCustomA_nwProject.nwx
index 8747363b..14abf9e2 100644
--- a/tests/reference/coreProject_NewCustomA_nwProject.nwx
+++ b/tests/reference/coreProject_NewCustomA_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:01:32">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>Test Custom</name>
     <title>Test Novel</title>
@@ -71,7 +71,7 @@
       <name status="s000008" import="i00000c">Entities</name>
     </item>
     <item handle="0000000000017" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000018" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -79,19 +79,19 @@
       <name status="s000008" import="i00000c">Chapter 1</name>
     </item>
     <item handle="0000000000019" parent="0000000000018" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Chapter 1</name>
     </item>
     <item handle="000000000001a" parent="0000000000018" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 1.1</name>
     </item>
     <item handle="000000000001b" parent="0000000000018" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 1.2</name>
     </item>
     <item handle="000000000001c" parent="0000000000018" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 1.3</name>
     </item>
     <item handle="000000000001d" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -99,19 +99,19 @@
       <name status="s000008" import="i00000c">Chapter 2</name>
     </item>
     <item handle="000000000001e" parent="000000000001d" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Chapter 2</name>
     </item>
     <item handle="000000000001f" parent="000000000001d" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 2.1</name>
     </item>
     <item handle="0000000000020" parent="000000000001d" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 2.2</name>
     </item>
     <item handle="0000000000021" parent="000000000001d" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 2.3</name>
     </item>
     <item handle="0000000000022" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -119,19 +119,19 @@
       <name status="s000008" import="i00000c">Chapter 3</name>
     </item>
     <item handle="0000000000023" parent="0000000000022" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Chapter 3</name>
     </item>
     <item handle="0000000000024" parent="0000000000022" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 3.1</name>
     </item>
     <item handle="0000000000025" parent="0000000000022" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 3.2</name>
     </item>
     <item handle="0000000000026" parent="0000000000022" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 3.3</name>
     </item>
   </content>
diff --git a/tests/reference/coreProject_NewCustomB_nwProject.nwx b/tests/reference/coreProject_NewCustomB_nwProject.nwx
index 7f397e85..bca6ea80 100644
--- a/tests/reference/coreProject_NewCustomB_nwProject.nwx
+++ b/tests/reference/coreProject_NewCustomB_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:03:03">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>Test Custom</name>
     <title>Test Novel</title>
@@ -71,31 +71,31 @@
       <name status="s000008" import="i00000c">Entities</name>
     </item>
     <item handle="0000000000017" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000018" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 1</name>
     </item>
     <item handle="0000000000019" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 2</name>
     </item>
     <item handle="000000000001a" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 3</name>
     </item>
     <item handle="000000000001b" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 4</name>
     </item>
     <item handle="000000000001c" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 5</name>
     </item>
     <item handle="000000000001d" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Scene 6</name>
     </item>
   </content>
diff --git a/tests/reference/coreProject_NewFile_nwProject.nwx b/tests/reference/coreProject_NewFile_nwProject.nwx
index 86f9cf11..d253ebcc 100644
--- a/tests/reference/coreProject_NewFile_nwProject.nwx
+++ b/tests/reference/coreProject_NewFile_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:09:19">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>New Project</name>
     <title></title>
@@ -57,7 +57,7 @@
       <name status="s000008" import="i00000c">World</name>
     </item>
     <item handle="0000000000014" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000015" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -65,19 +65,19 @@
       <name status="s000008" import="i00000c">New Chapter</name>
     </item>
     <item handle="0000000000016" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Chapter</name>
     </item>
     <item handle="0000000000017" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Scene</name>
     </item>
     <item handle="0000000000028" parent="31489056e0916" root="None" order="0" type="FILE" class="NO_CLASS" layout="NO_LAYOUT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="None" import="None" exported="True">Hello</name>
     </item>
     <item handle="0000000000029" parent="71ee45a3c0db9" root="None" order="0" type="FILE" class="NO_CLASS" layout="NO_LAYOUT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="None" import="None" exported="True">Jane</name>
     </item>
   </content>
diff --git a/tests/reference/coreProject_NewMinimal_nwProject.nwx b/tests/reference/coreProject_NewMinimal_nwProject.nwx
index 37a5428b..a6711a84 100644
--- a/tests/reference/coreProject_NewMinimal_nwProject.nwx
+++ b/tests/reference/coreProject_NewMinimal_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:00:23">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>New Project</name>
     <title></title>
@@ -57,7 +57,7 @@
       <name status="s000008" import="i00000c">World</name>
     </item>
     <item handle="0000000000014" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000015" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -65,11 +65,11 @@
       <name status="s000008" import="i00000c">New Chapter</name>
     </item>
     <item handle="0000000000016" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Chapter</name>
     </item>
     <item handle="0000000000017" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Scene</name>
     </item>
   </content>
diff --git a/tests/reference/coreProject_NewRoot_nwProject.nwx b/tests/reference/coreProject_NewRoot_nwProject.nwx
index 67c49f05..2ab62301 100644
--- a/tests/reference/coreProject_NewRoot_nwProject.nwx
+++ b/tests/reference/coreProject_NewRoot_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:04:09">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:34:25">
   <project>
     <name>New Project</name>
     <title></title>
@@ -57,7 +57,7 @@
       <name status="s000008" import="i00000c">World</name>
     </item>
     <item handle="0000000000014" parent="0000000000010" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">Title Page</name>
     </item>
     <item handle="0000000000015" parent="0000000000010" root="0000000000010" order="0" type="FOLDER" class="NOVEL">
@@ -65,11 +65,11 @@
       <name status="s000008" import="i00000c">New Chapter</name>
     </item>
     <item handle="0000000000016" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Chapter</name>
     </item>
     <item handle="0000000000017" parent="0000000000015" root="0000000000010" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="0" wordCount="0" paraCount="0" cursorPos="0"/>
       <name status="s000008" import="i00000c" exported="True">New Scene</name>
     </item>
     <item handle="0000000000028" parent="None" root="0000000000028" order="0" type="ROOT" class="NOVEL">
diff --git a/tests/reference/guiEditor_Main_Final_nwProject.nwx b/tests/reference/guiEditor_Main_Final_nwProject.nwx
index 3900c6d2..c4ba847c 100644
--- a/tests/reference/guiEditor_Main_Final_nwProject.nwx
+++ b/tests/reference/guiEditor_Main_Final_nwProject.nwx
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 21:23:06">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 16:55:50">
   <project>
     <name>New Project</name>
     <title></title>
     <saveCount>5</saveCount>
     <autoCount>2</autoCount>
-    <editTime>4</editTime>
+    <editTime>3</editTime>
   </project>
   <settings>
     <doBackup>True</doBackup>
@@ -45,7 +45,7 @@
       <name status="s000000" import="i000004">Novel</name>
     </item>
     <item handle="000000000000c" parent="0000000000008" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">Title Page</name>
     </item>
     <item handle="000000000000d" parent="0000000000008" root="0000000000008" order="1" type="FOLDER" class="NOVEL">
@@ -53,11 +53,11 @@
       <name status="s000000" import="i000004">New Chapter</name>
     </item>
     <item handle="000000000000e" parent="000000000000d" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Chapter</name>
     </item>
     <item handle="000000000000f" parent="000000000000d" root="0000000000008" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="612" wordCount="95" paraCount="10" cursorPos="768"/>
+      <meta expanded="False" charCount="612" wordCount="95" paraCount="10" cursorPos="768"/>
       <name status="s000000" import="i000004" exported="True">New Scene</name>
     </item>
     <item handle="0000000000009" parent="None" root="0000000000009" order="1" type="ROOT" class="PLOT">
@@ -65,7 +65,7 @@
       <name status="s000000" import="i000004">Plot</name>
     </item>
     <item handle="0000000000021" parent="0000000000009" root="0000000000009" order="0" type="FILE" class="PLOT" layout="NOTE">
-      <meta charCount="48" wordCount="10" paraCount="1" cursorPos="69"/>
+      <meta expanded="False" charCount="48" wordCount="10" paraCount="1" cursorPos="69"/>
       <name status="s000000" import="i000004" exported="True">New Note</name>
     </item>
     <item handle="000000000000a" parent="None" root="000000000000a" order="2" type="ROOT" class="CHARACTER">
@@ -73,7 +73,7 @@
       <name status="s000000" import="i000004">Characters</name>
     </item>
     <item handle="0000000000020" parent="000000000000a" root="000000000000a" order="0" type="FILE" class="CHARACTER" layout="NOTE">
-      <meta charCount="34" wordCount="8" paraCount="1" cursorPos="51"/>
+      <meta expanded="False" charCount="34" wordCount="8" paraCount="1" cursorPos="51"/>
       <name status="s000000" import="i000004" exported="True">New Note</name>
     </item>
     <item handle="000000000000b" parent="None" root="000000000000b" order="3" type="ROOT" class="WORLD">
@@ -81,11 +81,11 @@
       <name status="s000000" import="i000004">World</name>
     </item>
     <item handle="0000000000022" parent="000000000000b" root="000000000000b" order="0" type="FILE" class="WORLD" layout="NOTE">
-      <meta charCount="51" wordCount="9" paraCount="1" cursorPos="68"/>
+      <meta expanded="False" charCount="51" wordCount="9" paraCount="1" cursorPos="68"/>
       <name status="s000000" import="i000004" exported="True">New Note</name>
     </item>
-    <item handle="0000000000024" parent="None" root="0000000000024" order="4" type="TRASH" class="TRASH">
-      <meta expanded="True"/>
+    <item handle="0000000000024" parent="None" root="0000000000024" order="4" type="ROOT" class="TRASH">
+      <meta expanded="False"/>
       <name status="s000000" import="i000004">Trash</name>
     </item>
   </content>
diff --git a/tests/reference/guiEditor_Main_Initial_nwProject.nwx b/tests/reference/guiEditor_Main_Initial_nwProject.nwx
index 66a4c94e..1a5fd5be 100644
--- a/tests/reference/guiEditor_Main_Initial_nwProject.nwx
+++ b/tests/reference/guiEditor_Main_Initial_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:57:43">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:28:44">
   <project>
     <name>New Project</name>
     <title></title>
@@ -45,7 +45,7 @@
       <name status="s000000" import="i000004">Novel</name>
     </item>
     <item handle="000000000000c" parent="0000000000008" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">Title Page</name>
     </item>
     <item handle="000000000000d" parent="0000000000008" root="0000000000008" order="1" type="FOLDER" class="NOVEL">
@@ -53,11 +53,11 @@
       <name status="s000000" import="i000004">New Chapter</name>
     </item>
     <item handle="000000000000e" parent="000000000000d" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Chapter</name>
     </item>
     <item handle="000000000000f" parent="000000000000d" root="0000000000008" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="9" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="9" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Scene</name>
     </item>
     <item handle="0000000000009" parent="None" root="0000000000009" order="1" type="ROOT" class="PLOT">
diff --git a/tests/reference/guiProjSettings_Dialog_nwProject.nwx b/tests/reference/guiProjSettings_Dialog_nwProject.nwx
index 77d01d45..326c63e5 100644
--- a/tests/reference/guiProjSettings_Dialog_nwProject.nwx
+++ b/tests/reference/guiProjSettings_Dialog_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-20 20:50:55">
+<novelWriterXML appVersion="1.7-alpha0" hexVersion="0x010700a0" fileVersion="1.4" timeStamp="2022-04-23 15:28:41">
   <project>
     <name>Project Name</name>
     <title>Project Title</title>
@@ -51,7 +51,7 @@
       <name status="s000000" import="i000004">Novel</name>
     </item>
     <item handle="000000000000c" parent="0000000000008" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">Title Page</name>
     </item>
     <item handle="000000000000d" parent="0000000000008" root="0000000000008" order="1" type="FOLDER" class="NOVEL">
@@ -59,11 +59,11 @@
       <name status="s000000" import="i000004">New Chapter</name>
     </item>
     <item handle="000000000000e" parent="000000000000d" root="0000000000008" order="0" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="11" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Chapter</name>
     </item>
     <item handle="000000000000f" parent="000000000000d" root="0000000000008" order="1" type="FILE" class="NOVEL" layout="DOCUMENT">
-      <meta charCount="9" wordCount="2" paraCount="0" cursorPos="0"/>
+      <meta expanded="False" charCount="9" wordCount="2" paraCount="0" cursorPos="0"/>
       <name status="s000000" import="i000004" exported="True">New Scene</name>
     </item>
     <item handle="0000000000009" parent="None" root="0000000000009" order="1" type="ROOT" class="PLOT">
diff --git a/tests/test_base/test_base_common.py b/tests/test_base/test_base_common.py
index d7ad4119..0ce153b4 100644
--- a/tests/test_base/test_base_common.py
+++ b/tests/test_base/test_base_common.py
@@ -161,6 +161,7 @@ def testBaseCommon_IsItemClass():
     assert isItemClass("ARCHIVE") is True
     assert isItemClass("TRASH") is True
 
+    # Invalid
     assert isItemClass("None") is False
     assert isItemClass(None) is False
     assert isItemClass("STUFF") is False
@@ -176,8 +177,11 @@ def testBaseCommon_IsItemType():
     assert isItemType("ROOT") is True
     assert isItemType("FOLDER") is True
     assert isItemType("FILE") is True
-    assert isItemType("TRASH") is True
 
+    # Deprecated Type
+    assert isItemType("TRASH") is False
+
+    # Invalid
     assert isItemType("None") is False
     assert isItemType(None) is False
     assert isItemType("STUFF") is False
@@ -193,6 +197,16 @@ def testBaseCommon_IsItemLayout():
     assert isItemLayout("DOCUMENT") is True
     assert isItemLayout("NOTE") is True
 
+    # Deprecated Layouts
+    assert isItemLayout("TITLE") is False
+    assert isItemLayout("PAGE") is False
+    assert isItemLayout("BOOK") is False
+    assert isItemLayout("PARTITION") is False
+    assert isItemLayout("UNNUMBERED") is False
+    assert isItemLayout("CHAPTER") is False
+    assert isItemLayout("SCENE") is False
+
+    # Invalid
     assert isItemLayout("None") is False
     assert isItemLayout(None) is False
     assert isItemLayout("STUFF") is False
diff --git a/tests/test_core/test_core_item.py b/tests/test_core/test_core_item.py
index 572b31d7..fbc0ded3 100644
--- a/tests/test_core/test_core_item.py
+++ b/tests/test_core/test_core_item.py
@@ -283,8 +283,6 @@ def testCoreItem_TypeSetter(mockGUI):
     assert theItem.itemType == nwItemType.FOLDER
     theItem.setType("FILE")
     assert theItem.itemType == nwItemType.FILE
-    theItem.setType("TRASH")
-    assert theItem.itemType == nwItemType.TRASH
 
     # Alternative
     theItem.setType(nwItemType.ROOT)
@@ -500,8 +498,9 @@ def testCoreItem_XMLPackUnpack(mockGUI, caplog, mockRnd):
     assert etree.tostring(xContent, pretty_print=False, encoding="utf-8") == (
         b'<content>'
         b'<item handle="0123456789abc" parent="0123456789abc" root="0123456789abc" order="1" '
-        b'type="FILE" class="NOVEL" layout="NOTE"><meta charCount="7" wordCount="5" paraCount="3" '
-        b'cursorPos="11"/><name status="None" import="%s" exported="False">A Name</name></item>'
+        b'type="FILE" class="NOVEL" layout="NOTE"><meta expanded="False" charCount="7" '
+        b'wordCount="5" paraCount="3" cursorPos="11"/><name status="None" import="%s" '
+        b'exported="False">A Name</name></item>'
         b'</content>'
     ) % bytes(importKeys[3], encoding="utf8")
 
@@ -711,4 +710,8 @@ def testCoreItem_ConvertFromFmt13(mockGUI):
     assert theItem.itemType == nwItemType.FILE
     assert theItem.itemLayout == nwItemLayout.DOCUMENT
 
+    # Deprecated Type
+    theItem.setType("TRASH")
+    assert theItem.itemType == nwItemType.ROOT
+
 # END Test testCoreItem_ConvertFromFmt13
diff --git a/tests/test_core/test_core_tree.py b/tests/test_core/test_core_tree.py
index c70cc4bb..5c05f679 100644
--- a/tests/test_core/test_core_tree.py
+++ b/tests/test_core/test_core_tree.py
@@ -76,7 +76,7 @@ def mockItems(mockGUI, mockRnd):
 
     itemF = NWItem(theProject)
     itemF._name = "Trash"
-    itemF._type = nwItemType.TRASH
+    itemF._type = nwItemType.ROOT
     itemF._class = nwItemClass.TRASH
     itemF._expanded = False
 
@@ -172,7 +172,7 @@ def testCoreTree_BuildTree(mockGUI, mockItems):
     # Try to add another trash folder
     itemT = NWItem(theProject)
     itemT._name = "Trash"
-    itemT._type = nwItemType.TRASH
+    itemT._type = nwItemType.ROOT
     itemT._class = nwItemClass.TRASH
     itemT._expanded = False
 
@@ -353,12 +353,6 @@ def testCoreTree_Stats(mockGUI, mockItems):
     assert novelWords == 550
     assert noteWords == 400
 
-    # Count types
-    nRoot, nFolder, nFile = theTree.countTypes()
-    assert nRoot == 3
-    assert nFolder == 1
-    assert nFile == 3
-
 # END Test testCoreTree_Stats
 
 
@@ -419,25 +413,25 @@ def testCoreTree_XMLPackUnpack(mockGUI, mockItems):
         b'type="FOLDER" class="NOVEL"><meta expanded="True"/><name status="s000000" '
         b'import="i000004">Act One</name></item>'
         b'<item handle="c000000000001" parent="b000000000001" root="a000000000001" order="0" '
-        b'type="FILE" class="NOVEL" layout="DOCUMENT"><meta charCount="300" wordCount="50" '
-        b'paraCount="2" cursorPos="0"/><name status="s000000" import="i000004" '
+        b'type="FILE" class="NOVEL" layout="DOCUMENT"><meta expanded="False" charCount="300" '
+        b'wordCount="50" paraCount="2" cursorPos="0"/><name status="s000000" import="i000004" '
         b'exported="True">Chapter One</name></item>'
         b'<item handle="c000000000002" parent="b000000000001" root="a000000000001" order="0" '
-        b'type="FILE" class="NOVEL" layout="DOCUMENT"><meta charCount="3000" wordCount="500" '
-        b'paraCount="20" cursorPos="0"/><name status="s000000" import="i000004" '
+        b'type="FILE" class="NOVEL" layout="DOCUMENT"><meta expanded="False" charCount="3000" '
+        b'wordCount="500" paraCount="20" cursorPos="0"/><name status="s000000" import="i000004" '
         b'exported="True">Scene One</name></item>'
         b'<item handle="a000000000002" parent="None" root="a000000000002" order="0" type="ROOT" '
         b'class="ARCHIVE"><meta expanded="False"/><name status="s000000" '
         b'import="i000004">Outtakes</name></item>'
-        b'<item handle="a000000000003" parent="None" root="a000000000003" order="0" type="TRASH" '
+        b'<item handle="a000000000003" parent="None" root="a000000000003" order="0" type="ROOT" '
         b'class="TRASH"><meta expanded="False"/><name status="s000000" '
         b'import="i000004">Trash</name></item>'
         b'<item handle="a000000000004" parent="None" root="a000000000004" order="0" type="ROOT" '
         b'class="CHARACTER"><meta expanded="True"/><name status="s000000" '
         b'import="i000004">Characters</name></item>'
         b'<item handle="b000000000002" parent="a000000000004" root="a000000000004" order="0" '
-        b'type="FILE" class="CHARACTER" layout="NOTE"><meta charCount="2000" wordCount="400" '
-        b'paraCount="16" cursorPos="0"/><name status="s000000" import="i000004" '
+        b'type="FILE" class="CHARACTER" layout="NOTE"><meta expanded="False" charCount="2000" '
+        b'wordCount="400" paraCount="16" cursorPos="0"/><name status="s000000" import="i000004" '
         b'exported="True">Jane Doe</name></item>'
         b'</content>'
         b'</novelWriterXML>'
diff --git a/tests/test_gui/test_gui_projtree.py b/tests/test_gui/test_gui_projtree.py
index d7d44a78..84563086 100644
--- a/tests/test_gui/test_gui_projtree.py
+++ b/tests/test_gui/test_gui_projtree.py
@@ -304,9 +304,7 @@ def testGuiProjTree_DeleteItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockR
     # Delete item without focus -> blocked
     monkeypatch.setattr(GuiProjectTree, "hasFocus", lambda *a: False)
     nwTree.setSelectedHandle("0000000000012")
-    caplog.clear()
     assert nwTree.deleteItem() is False
-    assert "blocked" in caplog.text
     monkeypatch.setattr(GuiProjectTree, "hasFocus", lambda *a: True)
 
     # No selection made
@@ -399,10 +397,8 @@ def testGuiProjTree_DeleteItems(qtbot, caplog, monkeypatch, nwGUI, fncDir, mockR
     # ===========
 
     # Try to empty trash that is already empty
-    caplog.clear()
     assert nwTree.getTreeFromHandle(trashHandle) == [trashHandle]
     assert nwTree.emptyTrash() is False
-    assert "already empty" in caplog.text
 
     # Move the two remaining scene documents to trash
     assert nwTree.deleteItem("000000000000f") is True