diff --git a/src/components/Terminal/Command.js b/src/components/Terminal/Command.js
new file mode 100644
index 000000000..3c5db61e1
--- /dev/null
+++ b/src/components/Terminal/Command.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import Prompt from './Prompt';
+import { css } from '@emotion/core';
+
+const Command = ({ line, prompt, getTokenProps }) => (
+  <div
+    css={css`
+      display: grid;
+      grid-template-columns: 1ch 1fr;
+      grid-gap: 1ch;
+    `}
+  >
+    <Prompt character={prompt} />
+    <div
+      css={css`
+        color: #fafafa;
+        white-space: pre;
+      `}
+    >
+      {line.map((token, key) => (
+        // eslint-disable-next-line react/jsx-key
+        <span {...getTokenProps({ token, key })} />
+      ))}
+    </div>
+  </div>
+);
+
+Command.propTypes = {
+  line: PropTypes.arrayOf(PropTypes.object).isRequired,
+  getTokenProps: PropTypes.func.isRequired,
+  prompt: PropTypes.oneOf(['$', '>']),
+};
+
+export default Command;
diff --git a/src/components/Terminal/Output.js b/src/components/Terminal/Output.js
new file mode 100644
index 000000000..947abec93
--- /dev/null
+++ b/src/components/Terminal/Output.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { css } from '@emotion/core';
+
+const Output = ({ line }) => (
+  <div
+    css={css`
+      color: #fafafa;
+      white-space: pre;
+    `}
+  >
+    {line.map((token, key) => (
+      <span
+        key={key}
+        css={css`
+          color: ${OUTPUT_COLORS[token.color] || OUTPUT_COLORS.plain};
+        `}
+      >
+        {token.text}
+      </span>
+    ))}
+  </div>
+);
+
+const OUTPUT_COLORS = {
+  plain: 'currentColor',
+  green: 'var(--color-nord-14)',
+  red: 'var(--color-nord-11)',
+  muted: 'var(--color-nord-3)',
+  purple: 'var(--color-nord-15)',
+  blue: 'var(--color-nord-9)',
+};
+
+OUTPUT_COLORS.timestamp = OUTPUT_COLORS.muted;
+OUTPUT_COLORS.variable = OUTPUT_COLORS.purple;
+OUTPUT_COLORS.success = OUTPUT_COLORS.green;
+OUTPUT_COLORS.error = OUTPUT_COLORS.red;
+
+Output.propTypes = {
+  line: PropTypes.arrayOf(PropTypes.object).isRequired,
+};
+
+export default Output;
diff --git a/src/components/Terminal/SyntaxHighlighter.js b/src/components/Terminal/SyntaxHighlighter.js
index bc76b4ec3..066e06e77 100644
--- a/src/components/Terminal/SyntaxHighlighter.js
+++ b/src/components/Terminal/SyntaxHighlighter.js
@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import { css } from '@emotion/core';
 import Highlight from 'prism-react-renderer';
 import Prism from 'prismjs';
-import Prompt from './Prompt';
+import Command from './Command';
+import Output from './Output';
 
 const MULTILINE_COMMAND = /\\\s*$/;
 const OUTPUT_TAG = /^\[output\]\s/;
@@ -11,37 +12,26 @@ const OUTPUT_COLOR_TOKENS = /{([a-z]+)}(.*?(?={|$))/g;
 
 const SyntaxHighlighter = ({ code }) => (
   <Highlight Prism={Prism} code={code} language="shell">
-    {({ tokens, getLineProps, getTokenProps }) => {
+    {({ tokens, getTokenProps }) => {
       const commands = rollupIntoCommands(tokens, code);
 
-      return tokens.map((line, idx) => {
-        const previousLine = collapse(tokens[idx - 1] || []);
-        const isMultiline = MULTILINE_COMMAND.test(previousLine);
-
+      return commands.map(({ lines, output }, commandIdx) => {
         return (
-          // eslint-disable-next-line react/jsx-key
-          <div {...getLineProps({ line, key: idx })}>
-            <div
-              css={css`
-                display: grid;
-                grid-template-columns: 1ch 1fr;
-                grid-gap: 1ch;
-              `}
-            >
-              <Prompt character={isMultiline ? '>' : '$'} />
-              <div
-                css={css`
-                  color: #fafafa;
-                  white-space: pre;
-                `}
-              >
-                {line.map((token, key) => (
-                  // eslint-disable-next-line react/jsx-key
-                  <span {...getTokenProps({ token, key })} />
-                ))}
-              </div>
-            </div>
-          </div>
+          <>
+            {lines.map((line, idx) => {
+              return (
+                <Command
+                  key={`${commandIdx}-${idx}`}
+                  line={line}
+                  prompt={idx > 0 ? '>' : '$'}
+                  getTokenProps={getTokenProps}
+                />
+              );
+            })}
+            {output.map((line, idx) => (
+              <Output key={`${commandIdx}-${idx}`} line={line} />
+            ))}
+          </>
         );
       });
     }}