diff --git a/package.json b/package.json
index 42ef01ac..113ba572 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bigcommerce/stencil-cli",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "CLI tool to run BigCommerce Stores locally for theme development.",
   "main": "index.js",
   "engines": {
@@ -29,7 +29,7 @@
   },
   "homepage": "https://github.com/bigcommerce/stencil-cli",
   "dependencies": {
-    "@bigcommerce/stencil-paper": "^1.1.6",
+    "@bigcommerce/stencil-paper": "^1.1.7",
     "@bigcommerce/stencil-styles": "^1.0.2",
     "accept-language-parser": "^1.0.2",
     "archiver": "^0.14.4",
diff --git a/server/plugins/renderer/responses/pencil-response.js b/server/plugins/renderer/responses/pencil-response.js
index c473756b..0067bd5f 100644
--- a/server/plugins/renderer/responses/pencil-response.js
+++ b/server/plugins/renderer/responses/pencil-response.js
@@ -7,7 +7,6 @@ module.exports = function (data, assembler) {
     this.respond = function (request, reply) {
         var response,
             output,
-            html,
             paper,
             templatePath;
 
@@ -31,44 +30,7 @@ module.exports = function (data, assembler) {
                 return reply(data.context);
             }
 
-            if (data.remote || _.isArray(templatePath)) {
-
-                if (data.remote) {
-                    data.context = _.extend({}, data.context, data.remote_data);
-                }
-
-                if (templatePath) {
-                    // if multiple render_with
-                    if (_.isArray(templatePath)) {
-                        // if templatePath is an array ( multiple templates using render_with option)
-                        // compile all the template required files into a hash table
-                        html = templatePath.reduce(function(table, file) {
-                            table[file] = paper.render(file, data.context);
-
-                            return table;
-                        }, {});
-                    } else {
-                        html = paper.render(templatePath, data.context);
-                    }
-
-                    if (data.remote) {
-                        // combine the context & rendered html
-                        output = {
-                            data: data.remote_data,
-                            content: html
-                        };
-                    } else {
-                        output = html;
-                    }
-                } else {
-                    output = {
-                        data: data.remote_data
-                    };
-                }
-            } else {
-                output = paper.render(templatePath, data.context);
-            }
-
+            output = paper.renderTheme(templatePath, data);
             response = reply(output);
             response.code(data.statusCode);