diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js
index 841c0476e2..bb3ff65cf0 100644
--- a/src/Umbraco.Web.UI.Client/gulpfile.js
+++ b/src/Umbraco.Web.UI.Client/gulpfile.js
@@ -73,7 +73,6 @@ var sources = {
     js: {
         preview: { files: ["src/canvasdesigner/**/*.js"], out: "umbraco.canvasdesigner.js" },
         installer: { files: ["src/installer/**/*.js"], out: "umbraco.installer.js" },
-        
         controllers: { files: ["src/{views,controllers}/**/*.controller.js"], out: "umbraco.controllers.js" },
         directives: { files: ["src/common/directives/**/*.js"], out: "umbraco.directives.js" },
         filters: { files: ["src/common/filters/**/*.js"], out: "umbraco.filters.js" },
@@ -85,8 +84,7 @@ var sources = {
     //selectors for copying all views into the build
     //processed in the views task
     views:{
-        umbraco: {files: ["src/views/**/*html"], folder: ""},
-        preview: { files: ["src/canvasdesigner/**/*.html"], folder: "../preview"},
+        umbraco: {files: ["src/views/**/*.html"], folder: ""},
         installer: {files: ["src/installer/steps/*.html"], folder: "install"}
     },
 
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html
deleted file mode 100644
index 84add72919..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/background.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.background">
-
-    <div class="box-slider">
-        <div colorpicker ng-model="item.values.color"></div>
-    </div>
-
-    <div class="box-slider">
-        <div class="imagePickerPreview" ng-click="open(item.values)" style="background-image:{{ item.values.imageorpattern }}">
-            <i ng-if="item.values.imageorpattern == ''" class="icon icon-picture"></i>
-            <i ng-if="item.values.imageorpattern != ''" class="icon icon-delete" ng-click="item.values.imageorpattern = ''"></i>
-        </div>
-    </div>
-
-</div>
-
-<script type="text/ng-template" id="mediaPickerModal.html">
-
-    <div ng-controller="canvasdesigner.mediaPickerModal">
-
-        <div class="modal-header bodyCanvasdesignerImagePicker ng-scope">
-            <ul class="breadcrumb">
-                <li ng-if="startNodeId == -1">
-                    <a href="" ng-click="gotoFolder()">Media</a>
-                </li>
-
-                <!-- ngRepeat: item in path -->
-                <li ng-repeat="item in currentPath" class="ng-scope">
-                    / <a ng-if="currentFolder.id == item.id" href="" ng-class="{disabled:currentFolder.id == item.id}">{{ item.name }}</a>
-                    <a ng-if="currentFolder.id != item.id" ng-click="gotoFolder(item)">{{ item.name }}</a>
-                </li>
-            </ul>
-        </div>
-
-        <div class="modal-body bodyCanvasdesignerImagePicker">
-            <ul class="canvasdesignerImagePicker">
-                <li>
-                    <ul class="media-items">
-                        <li ng-repeat="child in currentFolder.children | orderBy:'isFolder':true">
-                            <div ng-if="!child.isFolder" class="media-preview" ng-class="{selected:selectedMedia.id == child.id}" ng-click="selectMedia(child)" style="background-image: url({{ child.thumbnail }})"></div>
-                            <div ng-if="child.isFolder" class="media-preview" ng-click="selectMedia(child)">
-                                <i class="icon icon-folder folder"><p class="folder-name">{{child.name}}</p></i>
-                            </div>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-        </div>
-
-        <div class="right">
-            <a class="btn" href="#" ng-click="cancelAndClose()">Cancel</a>
-            <a class="btn btn-success" href="#" ng-click="submitAndClose()">Done</a>
-        </div>
-
-    </div>
-
-</script>
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/border.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/border.html
deleted file mode 100644
index 651cd67446..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/border.html
+++ /dev/null
@@ -1,20 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.border" class="bordereditor">
-
-    <div class="box-slider">
-        <ul class="box-preview">
-            <li ng-repeat="border in borderList" class="border-{{border}}" ng-class="{selected: selectedBorder.name == border}" ng-click="setselectedBorder(border)"></li>
-        </ul>
-    </div>
-
-    <div class="box-slider" ng-repeat="border in borderList" ng-show="selectedBorder.name == border">
-        <div colorpicker ng-model="item.values[(border !== 'all' ? border : '') + 'bordercolor']"></div>
-        <select class="borderStyleSelect" ng-model="selectedBorder.type" ng-options="bordertype for bordertype in bordertypes"></select>
-        <!--<i ng-if="selectedBorder.color != ''" ng-click="selectedBorder.color= ''" class="icon icon-delete colorPickerDelete"></i>-->
-    </div>
-
-    <div class="box-slider">
-        <div ui-slider min="0" max="40" step="1" ng-model="selectedBorder.size"></div>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html
deleted file mode 100644
index 94a412f128..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/color.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="box-slider">
-    <div colorpicker ng-model="item.values.color"></div>
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.html
deleted file mode 100644
index 6ff7aa2a72..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/googlefontpicker.html
+++ /dev/null
@@ -1,34 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.googlefontpicker">
-
-    <div class="box-slider">
-        <div class="fontFamilyPickerPreview" ng-click="open(item.values)" ng-style="setStyleVariant()">
-            <span>Aa</span>
-            {{ item.values.fontFamily }}
-            <i ng-if="item.values.fontFamily != ''" ng-click="item.values.fontFamily = ''" class="icon icon-delete fontPickerDelete"></i>
-        </div>
-    </div>
-
-</div>
-
-<script type="text/ng-template" id="googlefontdialog.html">
-
-    <div ng-controller="googlefontdialog.controller">
-
-        <div class="modal-header canvasdesigner-fontfamilypicker">
-            <select class="font-list" ng-model="selectedFont" ng-change="showFontPreview(selectedFont)" ng-options="font as font.fontFamily group by font.fontType for font in fonts"></select>
-            <select class="variant-list" ng-model="selectedFont.variant" ng-change="showFontPreview(selectedFont,selectedFont.variant)" ng-options="variant for variant in selectedFont.variants" />
-        </div>
-
-        <div class="modal-body canvasdesigner-fontfamilypicker">
-            <span class="show" ng-style="setStyleVariant()">Aa Bb Cc 1 2 3 4&hellip; <br />The quick brown fox jumps over the lazy dog&hellip;</span>
-        </div>
-
-        <div class="right">
-            <a class="btn" href="#" ng-click="cancelAndClose()">Cancel</a>
-            <a class="btn btn-success" href="#" ng-click="submitAndClose()">Done</a>
-        </div>
-
-    </div>
-
-</script>
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/gridRow.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/gridRow.html
deleted file mode 100644
index bcfc79ef63..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/gridRow.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.gridRow">
-
-    <div class="box-slider">
-        <input type="checkbox" ng-model="item.values.fullsize" /><label>Full size</label>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/layout.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/layout.html
deleted file mode 100644
index 5a0dfed448..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/layout.html
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.layout">
-
-    <div class="box-slider">
-        <input type="radio" ng-model="item.values.layout" value="box"> Box
-        <input type="radio" ng-model="item.values.layout" value="wide"> Wide
-        <input type="radio" ng-model="item.values.layout" value="full"> Full
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/margin.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/margin.html
deleted file mode 100644
index 145c38f2f3..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/margin.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.margin">
-
-    <div class="box-slider"> 
-        <ul class="box-preview">
-            <li ng-repeat="margin in marginList" class="border-{{margin}}" ng-class="{selected: selectedmargin.name == margin}" ng-click="setSelectedmargin(margin)"></li>
-        </ul>
-    </div>
-
-    <div class="box-slider">
-        <div ui-slider min="0" max="400" step="1" ng-model="selectedmargin.value"></div>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/padding.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/padding.html
deleted file mode 100644
index e645ce0a67..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/padding.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.padding">
-
-    <div class="box-slider">
-        <ul class="box-preview">
-            <li ng-repeat="padding in paddingList" class="border-{{padding}}" ng-class="{selected: selectedpadding.name == padding}" ng-click="setSelectedpadding(padding)"></li>
-        </ul>
-    </div>
-
-    <div class="box-slider">
-        <div ui-slider min="0" max="400" step="1" ng-model="selectedpadding.value"></div>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/radius.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/radius.html
deleted file mode 100644
index 328698b44b..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/radius.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.radius">
-
-    <div class="box-slider">
-        <ul class="box-preview">
-            
-            <li ng-repeat="radius in radiusList" ng-class="{selected: selectedradius.name == radius}" ng-click="setSelectedradius(radius)">
-                <span ng-show="radius == 'topleft' || radius == 'all'" class="radius-top-left"></span>
-                <span ng-show="radius == 'topright' || radius == 'all'" class="radius-top-right"></span>
-                <span ng-show="radius == 'bottomleft' || radius == 'all'" class="radius-bottom-left"></span>
-                <span ng-show="radius == 'bottomright' || radius == 'all'" class="radius-bottom-right"></span>
-            </li>
-
-        </ul>
-    </div>
-
-    <div class="box-slider">
-        <div ui-slider min="0" max="40" step="1" ng-model="selectedradius.value"></div>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.html
deleted file mode 100644
index f9f88401c4..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/shadow.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.shadow">
-
-    <div class="box-slider">
-        <div ui-slider min="0" max="100" step="1" ng-model="item.values.shadow"></div>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/slider.html b/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/slider.html
deleted file mode 100644
index f33d314841..0000000000
--- a/src/Umbraco.Web.UI.Client/src/canvasdesigner/editors/slider.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div ng-controller="Umbraco.canvasdesigner.slider">
-
-    <div class="box-slider">
-        <div ui-slider min="{{item.min}}" max="{{item.max}}" step="1" ng-model="item.values.slider"></div>
-    </div>
-
-</div>
\ No newline at end of file
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 7d370140b5..48ad0bb58f 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1006,7 +1006,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Umbraco\preview\" />
     <Folder Include="Views\MacroPartials\" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index c6d528bb3d..a505fb477a 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -316,6 +316,7 @@
     <Compile Include="Cache\TemplateCacheRefresher.cs" />
     <Compile Include="Cache\UnpublishedPageCacheRefresher.cs" />
     <Compile Include="Cache\UserCacheRefresher.cs" />
+    <Compile Include="Editors\PreviewController.cs" />
     <Compile Include="Features\DisabledFeatures.cs" />
     <Compile Include="Editors\BackOfficeNotificationsController.cs" />
     <Compile Include="Editors\BackOfficeServerVariables.cs" />