diff --git a/editors/demo/src/HHMI/layout/EditorElements.js b/editors/demo/src/HHMI/layout/EditorElements.js
index 6385a12476a44c7cdefc72f1350e695c4ff63823..6a5fd031eab00bcabc843d96ec26f1197c00ed16 100644
--- a/editors/demo/src/HHMI/layout/EditorElements.js
+++ b/editors/demo/src/HHMI/layout/EditorElements.js
@@ -319,97 +319,4 @@ export default css`
   .transform-icon {
     transform: rotate(40deg);
   }
-
-  /* -- Questions ---------------------------------- */
-
-  /* -- Multiple Choice ---------------------------------- */
-
-  .multiple-choice,
-  .multiple-choice-single-correct,
-  .true-false,
-  .true-false-single-correct {
-    border: 3px solid #f5f5f7;
-    counter-reset: question-item-multiple;
-    margin: 38px;
-    padding: 20px;
-    padding-top: 0px;
-
-    &:before {
-      bottom: 25px;
-      counter-increment: multiple-question;
-      position: relative;
-      right: 20px;
-    }
-
-    .ProseMirror {
-      box-shadow: none;
-      padding: 5px 5px 0 5px;
-    }
-  }
-
-  .multiple-choice {
-    &:before {
-      content: 'Answer Group ' counter(multiple-question) ' (multiple choice)';
-    }
-  }
-
-  .multiple-choice-single-correct {
-    &:before {
-      content: 'Answer Group ' counter(multiple-question)
-        ' (multiple choice single correct)';
-    }
-  }
-
-  .true-false {
-    &:before {
-      content: 'Answer Group ' counter(multiple-question) ' (true/false)';
-    }
-  }
-
-  .true-false-single-correct {
-    &:before {
-      content: 'Answer Group ' counter(multiple-question)
-        ' (true/false single correct)';
-    }
-  }
-
-  /* -- Fill The Gap ---------------------------------- */
-
-  .fill-the-gap {
-    border: 3px solid #f5f5f7;
-    margin-bottom: 30px;
-    margin-top: 30px;
-    padding: 3px;
-
-    &:before {
-      background-color: #fff;
-      bottom: 22px;
-      color: #535e76;
-      content: 'Fill The Gap';
-      height: 10px;
-      left: -1px;
-      position: relative;
-      width: 30px;
-    }
-  }
-
-  /* -- Essay ---------------------------------- */
-
-  .essay {
-    border: 3px solid #f5f5f7;
-    margin-bottom: 30px;
-    margin-top: 30px;
-    padding: 3px;
-
-    &:before {
-      background-color: #fff;
-      bottom: 22px;
-      color: #535e76;
-      content: 'Essay';
-      height: 10px;
-      left: -1px;
-      position: relative;
-      width: 30px;
-    }
-  }
 `;
diff --git a/wax-prosemirror-services/src/EssayService/EssayService.js b/wax-prosemirror-services/src/EssayService/EssayService.js
index ca55033de74e5d49d108765cdfeb686a43403d6c..761e9aa834fe14b1fa6a3d097129ac90e242dcfa 100644
--- a/wax-prosemirror-services/src/EssayService/EssayService.js
+++ b/wax-prosemirror-services/src/EssayService/EssayService.js
@@ -7,6 +7,7 @@ import EssayQuestionComponent from './components/EssayQuestionComponent';
 import EssayAnswerComponent from './components/EssayAnswerComponent';
 import EssayQuestionNodeView from './EssayQuestionNodeView';
 import EssayAnswerNodeView from './EssayAnswerNodeView';
+import './essay.css';
 
 class EssayService extends Service {
   register() {
diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js
index 4c378b7d81906831564039a854b2936649efa149..81726572c493dabadd777268ee86f06d4ecac43d 100644
--- a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js
+++ b/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js
@@ -5,6 +5,7 @@ import fillTheGapNode from './schema/fillTheGapNode';
 import CreateGapService from './CreateGapService/CreateGapService';
 import FillTheGapNodeView from './FillTheGapNodeView';
 import GapComponent from './components/GapComponent';
+import './fillTheGap.css';
 
 class FillTheGapQuestionService extends Service {
   register() {
diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
index 26274f70dcff4f801c14593b5fb4182f541af001..5227d4446a74b6ab56fa8e68f4b0dd645c6e1206 100644
--- a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
+++ b/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js
@@ -10,6 +10,7 @@ import QuestionNodeView from './QuestionNodeView';
 import MultipleChoiceSingleCorrectQuestionService from './MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestionService';
 import TrueFalseQuestionService from './TrueFalseQuestionService/TrueFalseQuestionService';
 import TrueFalseSingleCorrectQuestionService from './TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestionService';
+import './multipleQuestionStyles.css';
 
 class MultipleChoiceQuestionService extends Service {
   register() {