diff --git a/wax-prosemirror-plugins/index.js b/wax-prosemirror-plugins/index.js
index ec6147c23f2ab8ed646e954abfa0356228f650ae..1a20ab5ca4d911d8a5fe26bf4288701836234999 100644
--- a/wax-prosemirror-plugins/index.js
+++ b/wax-prosemirror-plugins/index.js
@@ -1,17 +1,31 @@
-export { default as TrackChangePlugin } from "./src/trackChanges/TrackChangePlugin";
+export {
+  default as TrackChangePlugin
+} from "./src/trackChanges/TrackChangePlugin";
 export { default as FindAndReplacePlugin } from "./src/FindAndReplacePlugin";
 export { default as OverlayPlugin } from "./src/overlay/OverlayPlugin";
 export { default as LinkService } from "./src/LinkService/LinkService";
 export { default as MenuService } from "./src/MenuService/MenuService";
-export { default as RedoUndoService } from "./src/RedoUndoService/RedoUndoService";
-export { default as AnnotationService } from "./src/AnnotationService/AnnotationService";
-export { default as TextStyleService } from "./src/TextStyleService/TextStyleService";
-export { default as PlaceholderService } from "./src/PlaceholderService/PlaceholderService";
+export {
+  default as RedoUndoService
+} from "./src/RedoUndoService/RedoUndoService";
+export {
+  default as AnnotationService
+} from "./src/AnnotationService/AnnotationService";
+export {
+  default as TextStyleService
+} from "./src/TextStyleService/TextStyleService";
+export {
+  default as PlaceholderService
+} from "./src/PlaceholderService/PlaceholderService";
 export { default as ImageService } from "./src/ImageService/ImageService";
 export { default as RulesService } from "./src/RulesService/RulesService";
 export { default as SchemaService } from "./src/SchemaService/SchemaService";
 
-export { default as ShortCutsService } from "./src/ShortCutsService/ShortCutsService";
+export {
+  default as ShortCutsService
+} from "./src/ShortCutsService/ShortCutsService";
 export { default as Tool } from "./src/lib/Tools";
-export { default as InlineAnnotationsService } from "./src/InlineAnnotations/InlineAnnotationsService";
-export { default as OverlayService } from "./src/OverlayService/OverlayService";
+export {
+  default as InlineAnnotationsService
+} from "./src/InlineAnnotations/InlineAnnotationsService";
+// export { default as OverlayService } from "./src/OverlayService/OverlayService";
diff --git a/wax-prosemirror-plugins/src/AnnotationService/tools/index.js b/wax-prosemirror-plugins/src/AnnotationService/tools/index.js
index 8cfbcc999ac46aa50154ab5090ba6acff9aa8984..be85cabc3b9b1dcac46f24c485589b2dc0e7d92f 100644
--- a/wax-prosemirror-plugins/src/AnnotationService/tools/index.js
+++ b/wax-prosemirror-plugins/src/AnnotationService/tools/index.js
@@ -4,7 +4,7 @@ export { default as Em } from "./Em";
 export { default as Link } from "./Link";
 export { default as SmallCaps } from "./SmallCaps";
 export { default as StrikeThrough } from "./StrikeThrough";
-export { default as Strong } from "./Strong";
+// export { default as Strong } from "./Strong";
 export { default as Subscript } from "./Subscript";
 export { default as Superscript } from "./Superscript";
 export { default as Underline } from "./Underline";
diff --git a/wax-prosemirror-plugins/src/InlineAnnotations/CodeService/CodeService.js b/wax-prosemirror-plugins/src/InlineAnnotations/CodeService/CodeService.js
index 2baafb75211b7f09334e5eb9b24e237bf9fd7f70..eca18eec7b19f0fcf65df329bac2d04361e7112f 100644
--- a/wax-prosemirror-plugins/src/InlineAnnotations/CodeService/CodeService.js
+++ b/wax-prosemirror-plugins/src/InlineAnnotations/CodeService/CodeService.js
@@ -1,20 +1,12 @@
 import Service from "wax-prosemirror-core/src/services/Service";
 import { codeMark } from "wax-prosemirror-schema";
 import Code from "./Code";
-console.log(codeMark);
+
 class CodeService extends Service {
   boot() {
     const createMark = this.container.get("CreateMark");
 
-    createMark({
-      code: {
-        parseDOM: { tag: "code" },
-        toDOM(hook, next) {
-          hook.value = ["code", 0];
-          next();
-        }
-      }
-    });
+    createMark({ code: codeMark });
   }
 
   register() {
diff --git a/wax-prosemirror-plugins/src/InlineAnnotations/index.js b/wax-prosemirror-plugins/src/InlineAnnotations/index.js
index 87f98ab4f678d90d4eace4ca8f3a23d7f143d6b6..51cb6f0de07e9700beb6e7af01fa67baee820849 100644
--- a/wax-prosemirror-plugins/src/InlineAnnotations/index.js
+++ b/wax-prosemirror-plugins/src/InlineAnnotations/index.js
@@ -1,2 +1,3 @@
 import CodeService from "./CodeService/CodeService";
-export default [new CodeService()];
+import StrongService from "./StrongService/StrongService";
+export default [new CodeService(), new StrongService()];
diff --git a/wax-prosemirror-schema/index.js b/wax-prosemirror-schema/index.js
index 20910b0342aa3109c60fdce111e319b923069aac..64d1d1e226b2d5ea993c9a0152a5b376cc58c1cf 100644
--- a/wax-prosemirror-schema/index.js
+++ b/wax-prosemirror-schema/index.js
@@ -2,3 +2,4 @@ export { default as DefaultSchema } from "./src/DefaultSchema";
 export { default as EditoriaSchema } from "./src/editoria/EditoriaSchema";
 export { default as XpubSchema } from "./src/XpubSchema";
 export { default as codeMark } from "./src/marks/codeMark";
+export { default as strongMark } from "./src/marks/strongMark";
diff --git a/wax-prosemirror-schema/src/editoria/marks.js b/wax-prosemirror-schema/src/editoria/marks.js
index f4c577419bc8bae0bf1d40303e185e2095ab2206..7c74eee18a12a965313ec888f471ad88b518d36f 100644
--- a/wax-prosemirror-schema/src/editoria/marks.js
+++ b/wax-prosemirror-schema/src/editoria/marks.js
@@ -35,22 +35,22 @@ const marks = {
       return emDOM;
     }
   },
-  strong: {
-    parseDOM: [
-      { tag: "strong" },
-      {
-        tag: "b",
-        getAttrs: node => node.style.fontWeight != "normal" && null
-      },
-      {
-        style: "font-weight",
-        getAttrs: value => /^(bold(er)?|[5-9]\d{2,})$/.test(value) && null
-      }
-    ],
-    toDOM() {
-      return strongDOM;
-    }
-  },
+  // strong: {
+  //   parseDOM: [
+  //     { tag: "strong" },
+  //     {
+  //       tag: "b",
+  //       getAttrs: node => node.style.fontWeight != "normal" && null
+  //     },
+  //     {
+  //       style: "font-weight",
+  //       getAttrs: value => /^(bold(er)?|[5-9]\d{2,})$/.test(value) && null
+  //     }
+  //   ],
+  //   toDOM() {
+  //     return strongDOM;
+  //   }
+  // },
   // code: {
   //   parseDOM: [{ tag: "code" }],
   //   toDOM() {
diff --git a/wax-prosemirror-schema/src/marks/codeMark.js b/wax-prosemirror-schema/src/marks/codeMark.js
index ee9d55f2aa7ba463e87d92ff7d038546cb9ec6c1..a9e6ab1ef818a09622c2a272826ba30ba38c3e65 100644
--- a/wax-prosemirror-schema/src/marks/codeMark.js
+++ b/wax-prosemirror-schema/src/marks/codeMark.js
@@ -1,7 +1,8 @@
 const code = {
-  parseDOM: [{ tag: "code" }],
-  toDOM() {
-    return ["code", 0];
+  parseDOM: { tag: "code" },
+  toDOM(hook, next) {
+    hook.value = ["code", 0];
+    next();
   }
 };