diff --git a/css/editor.css b/css/editor.css
index 4a4bb68..c728002 100644
--- a/css/editor.css
+++ b/css/editor.css
@@ -46,7 +46,8 @@ body {
   border: 1px solid #DDDDDD;
   border-radius: 4px;
   position: relative;
-  word-wrap: break-word; }
+  word-wrap: break-word;
+  padding-left: 220px; }
 
 .edit .demo:after {
   background-color: #F5F5F5;
@@ -322,8 +323,6 @@ a.language-selected {
   background: inherit;
   color: inherit;
   display: inherit;
-  /*font-family: inherit;*/
-  /*font-size: inherit;*/
   line-height: inherit;
   margin: inherit;
   padding: inherit;
@@ -331,3 +330,52 @@ a.language-selected {
   -ms-text-size-adjust: inherit; }
   .toolbox-reset .collapse {
     display: block; }
+  .toolbox-reset .modal {
+    left: inherit; }
+
+/*
+ * Stuff we've deleted that comes from the bootstrap-combined.css file
+ */
+.toolbox-reset .modal {
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+  outline: none; }
+
+.toolbox-reset .modal.fade {
+  -webkit-transition: opacity .3s linear, top .3s ease-out;
+  -moz-transition: opacity .3s linear, top .3s ease-out;
+  -o-transition: opacity .3s linear, top .3s ease-out;
+  transition: opacity .3s linear, top .3s ease-out;
+  top: -25%; }
+
+.toolbox-reset .modal.fade.in {
+  top: 10%;
+  display: inherit !important; }
+
+#MD {
+  width: 992px; }
+
+#SM {
+  width: 768px; }
+
+#XS {
+  width: 480px; }
+
+#LG {
+  width: 100%; }
diff --git a/gulpfile.js b/gulpfile.js
index a9b2a6c..96522bc 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,7 +7,7 @@ var        sass = require('gulp-sass');
 
 
 gulp.task('sass', function () {
-  gulp.src('scss/*.scss')
+  gulp.src('scss/**/*.scss')
     .pipe(sass().on('error', sass.logError))
     .pipe(gulp.dest('css'));
 });
@@ -25,5 +25,5 @@ gulp.task('serve', ['sass'], function () {
 
 
 gulp.task('sass:watch', function () {
-  gulp.watch('scss/*.scss', ['sass']);
+  gulp.watch('scss/**/*.scss', ['sass']);
 });
diff --git a/scss/editor.scss b/scss/editor.scss
index 99ac416..434298b 100644
--- a/scss/editor.scss
+++ b/scss/editor.scss
@@ -1,2 +1,3 @@
 @import 'partials/legacy';
 @import 'partials/overwrites';
+@import 'partials/editor';
diff --git a/scss/partials/_legacy.scss b/scss/partials/_legacy.scss
index da70317..400108c 100644
--- a/scss/partials/_legacy.scss
+++ b/scss/partials/_legacy.scss
@@ -43,8 +43,10 @@ body {
   position:relative;
   word-wrap: break-word;
   padding-left: 220px;
+
 }
 
+
 .edit .demo:after {
 	background-color: #F5F5F5;
 	border: 1px solid #DDDDDD;
diff --git a/scss/partials/_overwrites.scss b/scss/partials/_overwrites.scss
index 14669c6..200cc99 100644
--- a/scss/partials/_overwrites.scss
+++ b/scss/partials/_overwrites.scss
@@ -1,16 +1,18 @@
 .toolbox-reset {
-    background: inherit;
-    color: inherit;
-    display: inherit;
-    /*font-family: inherit;*/
-    /*font-size: inherit;*/
-    line-height: inherit;
-    margin: inherit;
-    padding: inherit;
-    -webkit-text-size-adjust: inherit;
-    -ms-text-size-adjust: inherit;
+  background: inherit;
+  color: inherit;
+  display: inherit;
+  line-height: inherit;
+  margin: inherit;
+  padding: inherit;
+  -webkit-text-size-adjust: inherit;
+  -ms-text-size-adjust: inherit;
 
-    & .collapse {
-      display: block;
-    }
+  .collapse {
+    display: block;
+  }
+
+  .modal {
+    left: inherit;
+  }
 }