diff --git a/.gitignore b/.gitignore
index a2dc4b849a4a0bd78bc68e7742578768c953d0be..dffb9737b6fd72effea07792d83540de045d1498 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ node_modules/
 tmp/
 sample/ckeditor.dist.js
 /package-lock.json
+*~
diff --git a/package.json b/package.json
index d6d1e1a0222d295b4ddfc0605288cd53a241abed..c06a2c479d48f9b080fd14c49af4224bcc62713b 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "@ckeditor/ckeditor5-inspector": "^2.2.2",
     "@ckeditor/ckeditor5-link": ">=32.0.0",
       "@ckeditor/ckeditor5-list": ">=32.0.0",
-          "@ckeditor/ckeditor5-markdown-gfm": ">=32.0.0",
+      "@ckeditor/ckeditor5-markdown-gfm": ">=32.0.0",
     "@ckeditor/ckeditor5-package-tools": "^1.0.0-beta.4",
       "@ckeditor/ckeditor5-paragraph": ">=32.0.0",
           "@ckeditor/ckeditor5-source-editing": ">=32.0.0",
diff --git a/sample/ckeditor.js b/sample/ckeditor.js
index 4662f44b3d0d73c33f13f8a4c8b74535cc550162..cd10ff3a3f75c7799c56e4e12cc09c4b7415b372 100644
--- a/sample/ckeditor.js
+++ b/sample/ckeditor.js
@@ -25,14 +25,14 @@ import Table from '@ckeditor/ckeditor5-table/src/table';
 import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar';
 import TodoList from '@ckeditor/ckeditor5-list/src/todolist';
 
-import MathJaxCodeDelimiters from '../src/mathjax_code_delimiters';
+import { ComplexitywikiPlugins } from '../src/index';
 
 /* global document, window */
 
 ClassicEditor
 	.create( document.querySelector( '#editor' ), {
 		plugins: [
-			MathJaxCodeDelimiters,
+			ComplexitywikiPlugins,
 			Autoformat,
 			AutoImage,
 			BlockQuote,
diff --git a/src/mathjax_code_delimiters.js b/src/complexitywiki_plugins.js
similarity index 82%
rename from src/mathjax_code_delimiters.js
rename to src/complexitywiki_plugins.js
index 4740fe1acce3c93682fa938ad848827942efd608..e7fc68abc1dbfe64ed61f77a3d9a27ee1ebc7076 100644
--- a/src/mathjax_code_delimiters.js
+++ b/src/complexitywiki_plugins.js
@@ -5,12 +5,18 @@ import {
 	ButtonView
 } from 'ckeditor5/src/ui';
 
+import Code from '@ckeditor/ckeditor5-basic-styles/src/code';
+
 import displayIcon from '../theme/icons/display.svg';
 import inlineIcon from '../theme/icons/inline.svg';
 
-export default class MathJaxCodeDelimiters extends Plugin {
+export default class ComplexitywikiPlugins extends Plugin {
 	static get pluginName() {
-		return 'MathJaxCodeDelimiters';
+		return 'ComplexitywikiPlugins';
+	}
+
+	static get requires() {
+		return [ Code ];
 	}
 
 	init() {
@@ -35,7 +41,7 @@ export default class MathJaxCodeDelimiters extends Plugin {
 			// position of the cursor.
 			this.listenTo( view, 'execute', () => {
 				model.change( writer => {
-					const textNode = writer.createText( '`$ $`' );
+					const textNode = writer.createText( '$ $', { 'code': true } );
 					model.insertContent( textNode );
 				} );
 
@@ -60,7 +66,7 @@ export default class MathJaxCodeDelimiters extends Plugin {
 			// position of the cursor.
 			this.listenTo( view, 'execute', () => {
 				model.change( writer => {
-					const textNode = writer.createText( '`$$ $$`' );
+					const textNode = writer.createText( '$$ $$', { 'code': true } );
 					model.insertContent( textNode );
 				} );
 
diff --git a/src/index.js b/src/index.js
index 315373083be9838fdb80e2aa57da2241fa552a11..95360d6b50a25348559bb8b2fbc7d4492632de4d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1 @@
-import displayIcon from '../theme/icons/display.svg';
-import inlineIcon from '../theme/icons/inline.svg';
-
-export { MathJaxCodeDelimiters } from './mathjax_code_delimiters';
-// export { CaosDBReferenceLink } from './caosdb_reference_link';
-
-export const icons = {
-	displayIcon,
-	inlineIcon
-};
+export { default as ComplexitywikiPlugins } from './complexitywiki_plugins';