diff --git a/components/Carbon.js b/components/Carbon.js
index d595786..5feb023 100644
--- a/components/Carbon.js
+++ b/components/Carbon.js
@@ -1,10 +1,11 @@
 import { EOL } from 'os'
+import * as hljs from 'highlight.js'
 import React from 'react'
 import domtoimage from 'dom-to-image'
 import CodeMirror from 'react-codemirror'
 import Spinner from 'react-spinner'
 import WindowControls from '../components/WindowControls'
-import { COLORS } from '../lib/constants'
+import { COLORS, DEFAULT_LANGUAGE, LANGUAGE_HASH } from '../lib/constants'
 
 const DEFAULT_SETTINGS = {
   paddingVertical: '50px',
@@ -13,7 +14,7 @@ const DEFAULT_SETTINGS = {
   marginHorizontal: '45px',
   background: '#fed0ec',
   theme: 'dracula',
-  language: 'javascript'
+  language: DEFAULT_LANGUAGE
 }
 
 class Carbon extends React.Component {
@@ -21,14 +22,39 @@ class Carbon extends React.Component {
     super(props)
 
     this.state = {
-      loading: true
+      loading: true,
+      language: props.config.language
     }
+
+    this.handleLanguageChange = this.handleLanguageChange.bind(this)
   }
 
   componentDidMount() {
     this.setState({
       loading: false
     })
+
+    this.handleLanguageChange(this.props.children)
+  }
+
+  componentWillReceiveProps (newProps) {
+    this.handleLanguageChange(newProps.children, { customProps: newProps })
+  }
+
+  handleLanguageChange(newCode, config) {
+    const props = (config && config.customProps) || this.props
+
+    if (props.config.language.name === 'Auto') {
+      // try to set the language
+      const detectedLanguage = hljs.highlightAuto(newCode).language
+      const languageModule = LANGUAGE_HASH[detectedLanguage]
+
+      if (languageModule) {
+        this.setState({ language: languageModule })
+      }
+    } else {
+      this.setState({ language: props.config.language })
+    }
   }
 
   render () {
@@ -36,7 +62,7 @@ class Carbon extends React.Component {
 
     const options = {
       lineNumbers: false,
-      mode: config.language,
+      mode: this.state.language ? this.state.language.module : 'plaintext',
       theme: config.theme,
       scrollBarStyle: null,
       viewportMargin: Infinity,
@@ -67,6 +93,7 @@ class Carbon extends React.Component {
           { config.windowControls ? <WindowControls theme={config.windowTheme} /> : null }
           <CodeMirror
             className={`CodeMirror__container window-theme__${config.windowTheme} ${config.dropShadow ? 'dropshadow' : ''}`}
+            onChange={this.handleLanguageChange}
             value={this.props.children}
             options={options}
           />
diff --git a/lib/constants.js b/lib/constants.js
index 4ceee7b..9056fbc 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -55,6 +55,10 @@ export const LANGUAGES = [
   {
     name: 'Plain Text'
   },
+  {
+    name: 'C',
+    module: 'clike'
+  },
   {
     name: 'Clojure',
     module: 'clojure'
@@ -229,6 +233,10 @@ export const LANGUAGES = [
   }
 ]
 
+export const LANGUAGE_HASH = toHash(LANGUAGES)
+
+export const DEFAULT_LANGUAGE = { name: 'Auto' }
+
 export const COLORS = {
   BLACK: '#121212',
   PRIMARY: '#F8E81C',
@@ -255,3 +263,13 @@ if (typeof window !== 'undefined' && typeof window.navigator !== 'undefined') {
     }
   })
 }
+
+function toHash (list) {
+  return list.reduce((accum, item) => {
+    if (item.module) {
+      accum[item.module] = item
+    }
+
+    return accum
+  }, {})
+}
\ No newline at end of file
diff --git a/pages/editor.js b/pages/editor.js
index 212e17f..8925812 100644
--- a/pages/editor.js
+++ b/pages/editor.js
@@ -8,7 +8,7 @@ import ReadFileDropContainer from '../components/ReadFileDropContainer'
 import Toolbar from '../components/Toolbar'
 import Carbon from '../components/Carbon'
 import api from '../lib/api'
-import { THEMES, LANGUAGES, COLORS, DEFAULT_CODE } from '../lib/constants'
+import { THEMES, LANGUAGES, DEFAULT_LANGUAGE, COLORS, DEFAULT_CODE } from '../lib/constants'
 
 class Editor extends React.Component {
   /* pathname, asPath, err, req, res */
@@ -29,7 +29,7 @@ class Editor extends React.Component {
     this.state = {
       background: '#ABB8C3',
       theme: THEMES[0].id,
-      language: 'javascript', // TODO LANGUAGES[0]
+      language: DEFAULT_LANGUAGE,
       dropShadow: true,
       windowControls: true,
       paddingVertical: '48px',