diff --git a/core/discovery/content-data.js b/core/discovery/content-data.js
index b3cbac66..997e40a8 100644
--- a/core/discovery/content-data.js
+++ b/core/discovery/content-data.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const glob = require('glob');
 const gutil = require('gulp-util');
-const _camelCase = require('lodash/string/camelCase');
+const _ = require('lodash');
 
 const DATA_DIRECTORY = 'content/data/';
 
@@ -23,7 +23,7 @@ function discover() {
 
   for (const filepath of dataFilePaths) {
     const fileName = path.parse(filepath).name;
-    const camelCasedName = _camelCase(fileName);
+    const camelCasedName = _.camelCase(fileName);
 
     try {
       data[camelCasedName] = require(path.join(process.cwd(), filepath));
diff --git a/core/discovery/icons.js b/core/discovery/icons.js
index a7bb6f22..ed6d4cf0 100755
--- a/core/discovery/icons.js
+++ b/core/discovery/icons.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const glob = require('glob');
-const groupBy = require('lodash/collection/groupBy');
+const _ = require('lodash');
 
 const paths = require('../paths');
 
@@ -27,7 +27,7 @@ function discover() {
     .map(filename => path.parse(filename).name);
 
   return {
-    svg: groupBy(svgIcons, 'category'),
+    svg: _.groupBy(svgIcons, 'category'),
     iconFont: iconFontIcons,
   }
 }
diff --git a/core/styleguide/component-group.pug b/core/styleguide/component-group.pug
new file mode 100755
index 00000000..7a49100b
--- /dev/null
+++ b/core/styleguide/component-group.pug
@@ -0,0 +1,17 @@
+extends index
+
+block append pageVariables
+    - var pageTitle = componentGroup.docs && componentGroup.docs.attributes.title || componentGroup.group.id
+    - var moduleTitle = pageTitle + ' - Styleguide'
+
+block content
+
+    if !componentGroup.docs
+        h1.br-componentgroup-header(class=styleguideComponentGroupHeaderClass)= componentGroup.group.id
+    else
+        h1.br-componentgroup-header(class=styleguideComponentGroupHeaderClass)= componentGroup.docs.attributes.title || componentGroup.group.id
+        .br-content(class=styleguideRichContentClass)
+            != componentGroup.docs.body
+
+    each component in componentGroup.components
+        +sample(component)
diff --git a/core/styleguide/doc.pug b/core/styleguide/doc.pug
new file mode 100755
index 00000000..f11d2163
--- /dev/null
+++ b/core/styleguide/doc.pug
@@ -0,0 +1,7 @@
+extends index
+
+block append pageVariables
+    - var moduleTitle = doc.attributes.title + ' - Styleguide'
+
+block content
+    != doc.body
diff --git a/core/styleguide/index.pug b/core/styleguide/index.pug
new file mode 100644
index 00000000..596bd413
--- /dev/null
+++ b/core/styleguide/index.pug
@@ -0,0 +1,24 @@
+extends /templates/_layouts/master
+
+block append pageVariables
+    - var htmlClass = 'br-styleguide br-styleguide-default-styles-active'
+
+block body
+
+    .br-styleguide-container
+        .br-styleguide-container-inner
+            .br-styleguide-navigation-holder
+                unless styleguideHideBrand
+                    h1.br-styleguide-brand-heading(class=styleguideBrandClass)
+                        a.br-reset-link-styling(href="/styleguide" class=styleguideResetLinkStylingClass) #{projectTitle}
+
+                block nav
+                    include ../includes/styleguide-nav
+
+            .br-styleguide-content
+                .br-styleguide-content-inner
+                    block content
+                        block homeContent
+                            // Place style guide introduction here. By default redirects to first docs page.
+                            script.
+                                window.location = "/styleguide/docs/introduction.html"
diff --git a/package.json b/package.json
index 73379a88..c819f550 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "gulp-watch": "^4.3.5",
     "jquery": "^3.1.1",
     "js-beautify": "^1.5.10",
-    "lodash": "^3.10.1",
+    "lodash": "~4.17.5",
     "marked": "^0.3.9",
     "mkdirp": "^0.5.1",
     "moment": "^2.20.1",