diff --git a/components/Carbon.js b/components/Carbon.js
index a4057e9..fed2446 100644
--- a/components/Carbon.js
+++ b/components/Carbon.js
@@ -93,7 +93,7 @@ class Carbon extends React.PureComponent {
       (this.props.config.backgroundImage && this.props.config.backgroundImageSelection) ||
       this.props.config.backgroundImage
 
-    const themeConfig = THEMES_HASH[config.theme]
+    const themeConfig = this.props.theme || THEMES_HASH[config.theme]
 
     const content = (
       <div className="container">
diff --git a/components/Editor.js b/components/Editor.js
index 46d436b..02cd3cd 100644
--- a/components/Editor.js
+++ b/components/Editor.js
@@ -379,6 +379,7 @@ class Editor extends React.Component {
                 config={this.state}
                 onChange={this.updateCode}
                 loading={this.state.loading}
+                theme={theme}
               >
                 {code != null ? code : DEFAULT_CODE}
               </Carbon>