diff --git a/editors/demo/src/Editoria/layout/EditorElements.js b/editors/demo/src/Editoria/layout/EditorElements.js
index fbab00cdf1b7c807c7d1e605c0e5de0c342f2176..25b06611eb216a714fe7129137054be9be27d788 100644
--- a/editors/demo/src/Editoria/layout/EditorElements.js
+++ b/editors/demo/src/Editoria/layout/EditorElements.js
@@ -1,5 +1,16 @@
 import { css } from 'styled-components';
+import { th } from '@pubsweet/ui-toolkit';
 
 /* All styles regarding ProseMirror surface and elements */
 
-export default css``;
+const fontWriting = css`
+  color: ${th('colorText')};
+  font-family: ${th('fontWriting')};
+  font-size: ${th('fontSizeBase')};
+`;
+
+export default css`
+  .ProseMirror {
+    ${fontWriting}
+  }
+`;
diff --git a/editors/demo/src/HHMI/layout/EditorElements.js b/editors/demo/src/HHMI/layout/EditorElements.js
index fbab00cdf1b7c807c7d1e605c0e5de0c342f2176..25b06611eb216a714fe7129137054be9be27d788 100644
--- a/editors/demo/src/HHMI/layout/EditorElements.js
+++ b/editors/demo/src/HHMI/layout/EditorElements.js
@@ -1,5 +1,16 @@
 import { css } from 'styled-components';
+import { th } from '@pubsweet/ui-toolkit';
 
 /* All styles regarding ProseMirror surface and elements */
 
-export default css``;
+const fontWriting = css`
+  color: ${th('colorText')};
+  font-family: ${th('fontWriting')};
+  font-size: ${th('fontSizeBase')};
+`;
+
+export default css`
+  .ProseMirror {
+    ${fontWriting}
+  }
+`;
diff --git a/editors/demo/src/NCBI/layout/EditorElements.js b/editors/demo/src/NCBI/layout/EditorElements.js
index fcb7a36cfeaef041763c162fd847e3ad23431b14..636e7524ee3dda74683acbf49f4ff8d5fb2e40ef 100644
--- a/editors/demo/src/NCBI/layout/EditorElements.js
+++ b/editors/demo/src/NCBI/layout/EditorElements.js
@@ -14,8 +14,9 @@ export default css`
   .ProseMirror {
     background: white;
     line-height: 12px;
-    width: 497px;
+    width: 492px;
     white-space: pre !important;
     overflow-x: auto;
+    ${fontWriting}
   }
 `;
diff --git a/editors/demo/src/NCBI/layout/EditorMiniElements.js b/editors/demo/src/NCBI/layout/EditorMiniElements.js
index acb543571742196b9c94b19c58664cdb7d7c6e10..250d1f51a39b35b961c4c7e96fc3090a1a72b429 100644
--- a/editors/demo/src/NCBI/layout/EditorMiniElements.js
+++ b/editors/demo/src/NCBI/layout/EditorMiniElements.js
@@ -17,64 +17,10 @@ export default css`
     line-height: 12px;
     width: 497px;
     ${fontWriting}
-
-    p::selection,
-    h1::selection,
-    h2::selection,
-    h3::selection,
-    code::selection,
-    span::selection,
-    p span::selection,
-    h1 span::selection,
-    h2 span::selection,
-    h3 span::selection,
-    code span::selection title::selection {
-      background-color: transparent;
-    }
-
-    &:focus {
-      outline: none;
-    }
-  }
-
-  .ProseMirror .wax-selection-marker {
-    background-color: ${th('colorSelection')};
-  }
-
-  div[contenteditable='false'] {
-    pointer-events: none;
-    user-select: none;
   }
 
   .ProseMirror title {
     display: inline;
     font-size: 14px;
   }
-
-  ul,
-  ol {
-    padding-left: 30px;
-  }
-
-  sup,
-  sub {
-    line-height: 0;
-  }
-
-  p {
-    line-height: 21px;
-  }
-
-  /* placeholder */
-  .empty-node::before {
-    color: #aaa;
-    float: left;
-    font-style: italic;
-    pointer-events: none;
-    height: 0;
-  }
-
-  p.empty-node:first-child::before {
-    content: attr(data-content);
-  }
 `;
diff --git a/wax-prosemirror-core/src/styles/styles.css b/wax-prosemirror-core/src/styles/styles.css
index 678342449a452a5f991c4381d47624b0d721e5e6..670f3b37ceafa83e815c951badd8010fa933cf10 100644
--- a/wax-prosemirror-core/src/styles/styles.css
+++ b/wax-prosemirror-core/src/styles/styles.css
@@ -3,7 +3,7 @@
   background: #fff;
   color: #111;
   font-feature-settings: 'liga' 0; /* the above doesn't seem to work in Edge */
-  font-family: 'Merriweather';
+  font-family: 'Arial';
   font-variant-ligatures: none;
   line-height: 1.6;
   font-size: 14px;
diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js
index 4a72ecae84c24ae91931512cb30a088537ccdfd8..67310911c038d18f9d099f0436de7e60e760f401 100644
--- a/wax-prosemirror-services/src/NoteService/Editor.js
+++ b/wax-prosemirror-services/src/NoteService/Editor.js
@@ -27,7 +27,7 @@ export default ({ node, view }) => {
   let noteView;
   let clickInNote = false;
   let typing = false;
-  // eslint-disable-next-line react/destructuring-assignment
+
   const isEditable = context.view.main.props.editable(editable => {
     return editable;
   });