diff --git a/package.json b/package.json
index 58eb612eda..66e4a1d6ab 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "linkremixcore": "cd node_modules && rm -rf remix-core && ln -s ../remix/remix-core remix-core && cd ..",
     "linkremixlib": "cd node_modules && rm -rf remix-lib && ln -s ../remix/remix-lib remix-lib && cd ..",
     "linkremixsolidity": "cd node_modules && rm -rf remix-solidity && ln -s ../remix/remix-solidity remix-solidity && cd ..",
-    "build": "browserify src/index.js -o build/app.js",
+    "build": "browserify src/index.js -o build/app.js --exclude solc",
     "build_debugger": "browserify src/app/debugger/remix-debugger/index.js -o src/app/debugger/remix-debugger/build/app.js",
     "browsertest": "sleep 5 && npm run nightwatch_local",
     "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/",
@@ -175,6 +175,6 @@
     "start": "npm-run-all -lpr serve watch onchange remixd",
     "test": "npm run csslint; standard && node test/index.js",
     "test-browser": "npm-run-all -lpr selenium downloadsolc_root make-mock-compiler serve browsertest",
-    "watch": "watchify src/index.js -dv -p browserify-reload -o build/app.js"
+    "watch": "watchify src/index.js -dv -p browserify-reload -o build/app.js --exclude solc"
   }
 }
diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js
index 8eec777a8c..b9c7829679 100644
--- a/src/app/panels/terminal.js
+++ b/src/app/panels/terminal.js
@@ -74,6 +74,7 @@ class Terminal {
     self.registerCommand('html', self._blocksRenderer('html'), { activate: true })
     self.registerCommand('log', self._blocksRenderer('log'), { activate: true })
     self.registerCommand('info', self._blocksRenderer('info'), { activate: true })
+    self.registerCommand('warn', self._blocksRenderer('warn'), { activate: true })
     self.registerCommand('error', self._blocksRenderer('error'), { activate: true })
     self.registerCommand('script', function execute (args, scopedCommands, append) {
       var script = String(args[0])
@@ -87,6 +88,7 @@ class Terminal {
 
     self.registerFilter('log', basicFilter)
     self.registerFilter('info', basicFilter)
+    self.registerFilter('warn', basicFilter)
     self.registerFilter('error', basicFilter)
     self.registerFilter('script', basicFilter)
 
@@ -494,7 +496,7 @@ class Terminal {
         if (args.length) append(args[0])
       }
     }
-    mode = { log: styles.terminal.text_RegularLog, info: styles.terminal.text_InfoLog, error: styles.terminal.text_ErrorLog }[mode] // defaults
+    mode = { log: styles.terminal.text_RegularLog, info: styles.terminal.text_InfoLog, warn: styles.terminal.text_WarnLog, error: styles.terminal.text_ErrorLog }[mode] // defaults
     if (mode) {
       return function logger (args, scopedCommands, append) {
         var types = args.map(type)
@@ -595,6 +597,7 @@ function domTerminalFeatures (self, scopedCommands) {
     console: {
       log: function () { scopedCommands.log.apply(scopedCommands, arguments) },
       info: function () { scopedCommands.info.apply(scopedCommands, arguments) },
+      warn: function () { scopedCommands.warn.apply(scopedCommands, arguments) },
       error: function () { scopedCommands.error.apply(scopedCommands, arguments) }
     },
     setTimeout: (fn, time) => {
diff --git a/src/app/ui/styles-guide/style-guide.js b/src/app/ui/styles-guide/style-guide.js
index ba30df9a95..07e9899e72 100644
--- a/src/app/ui/styles-guide/style-guide.js
+++ b/src/app/ui/styles-guide/style-guide.js
@@ -455,6 +455,7 @@ function styleGuide () {
       text_RegularLog: appProperties.mainText_Color,
       text_InfoLog: appProperties.supportText_Color,
       text_ErrorLog: appProperties.errorText_Color,
+      text_WarnLog: appProperties.warningText_Color,
       text_Title_TransactionLog: appProperties.infoText_Color,
       text_Regular_TransactionLog: appProperties.supportText_Color,
       text_Button: appProperties.oppositeText_Color,