diff --git a/gulpfile.js b/gulpfile.js
index 001b6de..a6feb1c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -37,19 +37,18 @@ gulp.task('cleancss', function() {
     .pipe(rimraf());
 });
 
+
+// Copy all js files from bower_component assets to themes /js folder. Run this task after bower install or bower update
 gulp.task('copy-assets', function() {
     gulp.src('./bower_components/bootstrap-sass/assets/javascripts/*.js')
        .pipe(gulp.dest('./js'));
-    gulp.src('./bower_components/bootstrap-sass/assets/stylesheets/*.scss')
-       .pipe(gulp.dest('./sass/bootstrap'));
     gulp.src('./bower_components/bootstrap-sass/assets/fonts/bootstrap/*.{ttf,woff,eof,svg}')
         .pipe(gulp.dest('./fonts'));
-    gulp.src('./bower_components/font-awesome/fonts/**/*.{ttf,woff,eof,svg}')
+    gulp.src('./bower_components/fontawesome/fonts/**/*.{ttf,woff,eof,svg}')
         .pipe(gulp.dest('./fonts'));
     gulp.src('./bower_components/jquery/dist/*.js')
         .pipe(gulp.dest('./js'));
     gulp.src('./bower_components/_s/js/*.js')
         .pipe(gulp.dest('./js'));
-    gulp.src('./bower_components/_s/sass/**/*.scss')
-        .pipe(gulp.dest('./sass/underscores'));
+
 });
diff --git a/sass/theme.scss b/sass/theme.scss
index 1b8fad1..bae10f6 100644
--- a/sass/theme.scss
+++ b/sass/theme.scss
@@ -29,11 +29,11 @@ Import all needed 3rd party sass files plus your own style and variables
 ***************************************************************** */
 
 @import "../bower_components/_s/sass/style";
-@import "theme/theme_variables";
+@import "theme/theme_variables";  // <--------- Add your variables into this file. Also add variables to overwrite Bootstrap variables here
 @import "../bower_components/bootstrap-sass/assets/stylesheets/bootstrap";
 @import "understrap/understrap";
 @import "../bower_components/fontawesome/scss/font-awesome";
 
 
 // Any additional imported files //
-@import "theme/theme";
\ No newline at end of file
+@import "theme/theme";  // <--------- Add your styles into this file
\ No newline at end of file