diff --git a/app/components/SimpleEditor/config.js b/app/components/SimpleEditor/config.js
index 4b8d7725bfce2294c53f282cc531094b5e79cdc6..7a49a29b4641809f298de8ac1c82f34e31d1cb04 100644
--- a/app/components/SimpleEditor/config.js
+++ b/app/components/SimpleEditor/config.js
@@ -4,7 +4,6 @@ import {
   CodePackage,
   EmphasisPackage,
   HeadingPackage,
-  // LinkPackage,
   ParagraphPackage,
   PersistencePackage,
   ProseArticle,
@@ -14,15 +13,15 @@ import {
   SuperscriptPackage,
   SwitchTextTypePackage,
   SpellCheckPackage,
-  ListPackage
+  ListPackage,
+  CodeblockPackage
 } from 'substance'
 
 // My Elements
-// import CodeblockPackage from './elements/codeblock/CodeblockPackage'
 import CommentPackage from './elements/comment/CommentPackage'
-// import ExtractPackage from './elements/extract/ExtractPackage'
+import ExtractPackage from './elements/extract/ExtractPackage'
 import NotePackage from './elements/note/NotePackage'
-// import SourceNotePackage from './elements/source_note/SourceNotePackage'
+import SourceNotePackage from './elements/source_note/SourceNotePackage'
 import ImagePackage from './elements/images/ImagePackage'
 //
 import TrackChangePackage from './elements/track_change/TrackChangePackage'
@@ -52,17 +51,17 @@ let config = {
     config.import(SubscriptPackage)
     config.import(SuperscriptPackage)
     config.import(CodePackage)
-    // config.import(LinkPackage)
     config.import(PersistencePackage)
 
     config.import(LinkPackage)
     config.import(SpellCheckPackage)
     config.import(ListPackage)
-    // config.import(CodeblockPackage)
+    config.import(CodeblockPackage)
     // // config.import(DialoguePackage)
-    // config.import(ExtractPackage)
+    config.import(ExtractPackage)
     config.import(NotePackage)
-    // config.import(SourceNotePackage)
+    config.import(SourceNotePackage)
+    config.import(ImagePackage)
     config.import(CommentPackage)
     config.import(ImagePackage)
     //
diff --git a/app/components/SimpleEditor/elements/codeblock/Codeblock.js b/app/components/SimpleEditor/elements/codeblock/Codeblock.js
deleted file mode 100644
index ee74cf33849672de3324c7fcb34708562db45f80..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/codeblock/Codeblock.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { TextBlock } from 'substance'
-
-class Codeblock extends TextBlock {}
-
-Codeblock.type = 'codeblock'
-
-export default Codeblock
diff --git a/app/components/SimpleEditor/elements/codeblock/CodeblockComponent.js b/app/components/SimpleEditor/elements/codeblock/CodeblockComponent.js
deleted file mode 100644
index ef5c318cd443921f9a227e1418244d4b73a190e3..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/codeblock/CodeblockComponent.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import { TextBlockComponent } from 'substance'
-
-class CodeblockComponent extends TextBlockComponent {
-  render ($$) {
-    let el = super.render.call(this, $$)
-    return el.addClass('sc-codeblock')
-  }
-}
-
-export default CodeblockComponent
diff --git a/app/components/SimpleEditor/elements/codeblock/CodeblockHTMLConverter.js b/app/components/SimpleEditor/elements/codeblock/CodeblockHTMLConverter.js
deleted file mode 100644
index 61cfb2ee26ebdff9f2dfd656e13aa382d074e1e8..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/codeblock/CodeblockHTMLConverter.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default {
-  type: 'codeblock',
-  tagName: 'pre',
-
-  import: function (el, node, converter) {
-    let codeEl = el.find('code')
-    if (codeEl) {
-      node.content = converter.annotatedText(codeEl, [node.id, 'content'], { preserveWhitespace: true })
-    }
-  },
-
-  export: function (node, el, converter) {
-    let $$ = converter.$$
-
-    el.append(
-      $$('code').append(
-        converter.annotatedText([node.id, 'content'])
-      )
-    )
-  }
-}
diff --git a/app/components/SimpleEditor/elements/codeblock/CodeblockPackage.js b/app/components/SimpleEditor/elements/codeblock/CodeblockPackage.js
deleted file mode 100644
index 0058541e28e4d2d653aec40a6f463fa06e291175..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/codeblock/CodeblockPackage.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import Codeblock from './Codeblock'
-import CodeblockComponent from './CodeblockComponent'
-import CodeblockHTMLConverter from './CodeblockHTMLConverter'
-
-export default {
-  name: 'codeblock',
-  configure: function (config) {
-    config.addNode(Codeblock)
-
-    config.addComponent('codeblock', CodeblockComponent)
-    config.addConverter('html', CodeblockHTMLConverter)
-
-    config.addTextType({
-      name: 'codeblock',
-      data: {type: 'codeblock'}
-    })
-
-    config.addLabel('codeblock', {
-      en: 'Codeblock',
-      de: 'Codeblock'
-    })
-  }
-
-  // Codeblock: Codeblock,
-  // CodeblockComponent: CodeblockComponent,
-  // CodeblockHTMLConverter: CodeblockHTMLConverter
-}
diff --git a/app/components/SimpleEditor/elements/codeblock/codeblock.scss b/app/components/SimpleEditor/elements/codeblock/codeblock.scss
deleted file mode 100644
index 55c6293f75344ca0ac7dc5db405c797a499319fe..0000000000000000000000000000000000000000
--- a/app/components/SimpleEditor/elements/codeblock/codeblock.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-.sc-codeblock {
-  font-family: var(--font-family-code);
-  font-size: 15px;
-}
-
-// Toolbar styles
-// .sc-switch-text-type .se-option.sm-codeblock {
-//   font-family: var(--font-family-code);
-//   font-size: 15px;
-// }
diff --git a/app/components/SimpleEditor/elements/elements.scss b/app/components/SimpleEditor/elements/elements.scss
index b19c57bfeed185f0dcdbc6c68b8c97aaa5e4fb13..8f325e0398dcf5afa3676116df1ca1d1766bd265 100644
--- a/app/components/SimpleEditor/elements/elements.scss
+++ b/app/components/SimpleEditor/elements/elements.scss
@@ -1,4 +1,3 @@
-@import './codeblock/codeblock';
 @import './comment/comment';
 // @import './dialogue/dialogue';
 @import './extract/extract';
diff --git a/app/components/SimpleEditor/elements/extract/extract.scss b/app/components/SimpleEditor/elements/extract/extract.scss
index e18c6e5597eccc9fd72224ffbeb9034ee53ce388..bf279acd8ef67c262d90561646ee21b5e21308df 100644
--- a/app/components/SimpleEditor/elements/extract/extract.scss
+++ b/app/components/SimpleEditor/elements/extract/extract.scss
@@ -1,4 +1,4 @@
-.sc-extract {
+.sc-prose-editor .se-content .sc-extract {
   font-family: 'Fira Sans';
   font-style: italic;
   font-weight: 300;