diff --git a/addon/components/cfb-code-editor.js b/addon/components/cfb-code-editor.js
index ef4cf3649..d497f4109 100644
--- a/addon/components/cfb-code-editor.js
+++ b/addon/components/cfb-code-editor.js
@@ -3,8 +3,8 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { CodeJar } from "codejar";
 import Prism from "prismjs";
-import "prismjs/components/prism-jexl.min.js";
-import "prismjs/components/prism-markdown.min.js";
+import "prismjs/components/prism-jexl.js";
+import "prismjs/components/prism-markdown.js";
 
 export default class CfbCodeEditorComponent extends Component {
   editor;
diff --git a/addon/templates/components/cfb-code-editor.hbs b/addon/templates/components/cfb-code-editor.hbs
index 98a1876e1..f48eab0ca 100644
--- a/addon/templates/components/cfb-code-editor.hbs
+++ b/addon/templates/components/cfb-code-editor.hbs
@@ -1,13 +1,11 @@
-<div>
-  {{component @labelComponent}}
+{{component @labelComponent}}
 
-  <div
-    name={{@name}}
-    class={{concat "uk-textarea cfb-code-editor language-" @language}}
-    {{did-insert (action this.didInsertNode)}}
-    {{will-destroy (action this.willDestroyNode)}}
-  ></div>
+<div
+  name={{@name}}
+  class={{concat "uk-textarea cfb-code-editor language-" @language}}
+  {{did-insert this.didInsertNode}}
+  {{will-destroy this.willDestroyNode}}
+></div>
 
-  {{component @hintComponent}}
-  {{component @errorComponent}}
-</div>
\ No newline at end of file
+{{component @hintComponent}}
+{{component @errorComponent}}
\ No newline at end of file
diff --git a/app/styles/ember-caluma.scss b/app/styles/ember-caluma.scss
index 98175673e..e613246d4 100644
--- a/app/styles/ember-caluma.scss
+++ b/app/styles/ember-caluma.scss
@@ -24,7 +24,7 @@
 }
 
 .cfb-code-editor {
-  font-family: "Source Code Pro", monospace;
+  font-family: $base-code-font-family;
   letter-spacing: normal;
   height: 70px;
   line-height: 16px;
diff --git a/ember-cli-build.js b/ember-cli-build.js
index 50be382db..9e4e4f4c6 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -19,7 +19,6 @@ module.exports = function (defaults) {
 
   app.import("node_modules/typeface-oxygen/index.css");
   app.import("node_modules/typeface-oxygen-mono/index.css");
-  app.import("node_modules/prismjs/themes/prism.css");
 
   const oxygen = funnel("node_modules/typeface-oxygen/files", {
     include: ["*.woff", "*.woff2"],
diff --git a/index.js b/index.js
index d61e737e7..3d7e1cb27 100644
--- a/index.js
+++ b/index.js
@@ -32,6 +32,8 @@ module.exports = EngineAddon.extend({
   included(...args) {
     this._super.included.apply(this, args);
 
+    this.import("node_modules/prismjs/themes/prism.css");
+
     if (this._getOptions().includeProxyPolyfill) {
       this.import("node_modules/proxy-polyfill/proxy.min.js");
     }