diff --git a/assets/js/merlin.min.js b/assets/js/merlin.min.js
index fb00671..cb48e51 100755
--- a/assets/js/merlin.min.js
+++ b/assets/js/merlin.min.js
@@ -1 +1 @@
-var Merlin=function(n){function e(){var e=n(".merlin__body"),i=(n(".merlin__body--loading"),n(".merlin__body--exiting"),n("#merlin__drawer-trigger"));drawer_opened="merlin__drawer--open",setTimeout(function(){e.addClass("loaded")},100),i.on("click",function(){e.toggleClass(drawer_opened)}),n(".merlin__button--proceed:not(.merlin__button--closer)").click(function(n){n.preventDefault();var i=this.getAttribute("href");e.addClass("exiting"),setTimeout(function(){window.location=i},400)}),n(".merlin__button--closer").on("click",function(n){e.removeClass(drawer_opened),n.preventDefault();var i=this.getAttribute("href");setTimeout(function(){e.addClass("exiting")},600),setTimeout(function(){window.location=i},1100)}),n(".button-next").on("click",function(e){e.preventDefault();var i=s(this);if(!i)return!1;var t=n(this).data("callback");return t&&"undefined"!=typeof d[t]?(d[t](this),!1):!0})}function i(){function e(n){"undefined"!=typeof n.done?(setTimeout(function(){a.addClass("lead")},0),setTimeout(function(){a.addClass("success"),a.html(n.message)},600),t()):(a.addClass("lead error"),a.html(n.error))}function i(){jQuery.post(merlin_params.ajaxurl,{action:"merlin_child_theme",wpnonce:merlin_params.wpnonce},e).fail(e)}var t,o=n(".merlin__body"),a=n("#child-theme-text");return{init:function(e){t=function(){setTimeout(function(){n(".merlin__body").addClass("js--finished")},1500),o.removeClass(drawer_opened),setTimeout(function(){n(".merlin__body").addClass("exiting")},3500),setTimeout(function(){window.location.href=e.href},4e3)},i()}}}function t(){function e(n){"undefined"!=typeof n.done?(setTimeout(function(){a.addClass("lead")},0),setTimeout(function(){a.addClass("success"),a.html(n.message)},600),t()):(a.addClass("lead error"),a.html(n.error))}function i(){childThemeName=n("#theme_license_key").val(),jQuery.post(merlin_params.ajaxurl,{action:"merlin_activate_license",wpnonce:merlin_params.wpnonce,cThemeName:childThemeName},e).fail(e)}var t,o=n(".merlin__body"),a=n("#child-theme-text");return{init:function(e){t=function(){setTimeout(function(){n(".merlin__body").addClass("js--finished")},1500),o.removeClass(drawer_opened),setTimeout(function(){n(".merlin__body").addClass("exiting")},3500),setTimeout(function(){window.location.href=e.href},4e3)},i()}}}function o(){function e(n){"object"==typeof n&&"undefined"!=typeof n.message?(a.find("span").text(n.message),"undefined"!=typeof n.url?n.hash==l?(a.find("span").text("failed"),t()):(l=n.hash,jQuery.post(n.url,n,function(n){i()}).fail(e)):("undefined"!=typeof n.done,t())):(a.find("span").text("Success"),t())}function i(){d&&jQuery.post(merlin_params.ajaxurl,{action:"merlin_plugins",wpnonce:merlin_params.wpnonce,slug:d},e).fail(e)}function t(){var e=!1;a&&(a.data("done_item")||(r++,a.data("done_item",1)),a.find(".spinner").css("visibility","hidden"));var t=n(".merlin__drawer--install-plugins li");t.each(function(){""==d||e?(d=n(this).data("slug"),a=n(this),i(),e=!1):n(this).data("slug")==d&&(e=!0)}),r>=t.length&&o()}var o,a,s=n(".merlin__body"),r=0,d="",l="";return{init:function(e){n(".merlin__drawer--install-plugins").addClass("installing"),o=function(){setTimeout(function(){n(".merlin__body").addClass("js--finished")},1e3),s.removeClass(drawer_opened),setTimeout(function(){n(".merlin__body").addClass("exiting")},3e3),setTimeout(function(){window.location.href=e.href},3500)},t()}}}function a(){function e(n){var i=a.find("label");"object"==typeof n&&"undefined"!=typeof n.message?(i.addClass(n.message.toLowerCase()),"undefined"!=typeof n.url?n.hash===l?(i.addClass("status--failed"),t()):(l=n.hash,jQuery.post(n.url,n,e).fail(e)):("undefined"!=typeof n.done,t())):(console.log(n),i.addClass("status--error"),t())}function i(){if(d){var n=a.find("input:checkbox");n.is(":checked")?jQuery.post(merlin_params.ajaxurl,{action:"merlin_content",wpnonce:merlin_params.wpnonce,content:d},e).fail(e):(a.addClass("skipping"),setTimeout(t,300))}}function t(){var e=!1;a&&(a.data("done_item")||(r++,a.data("done_item",1)),a.find(".spinner").css("visibility","hidden"));var t=n(".merlin__drawer--import-content__list-item");n(".merlin__drawer--import-content__list-item input:checked");t.each(function(){""==d||e?(d=n(this).data("content"),a=n(this),i(),e=!1):n(this).data("content")==d&&(e=!0)}),r>=t.length&&o()}var o,a,s=n(".merlin__body"),r=0,d="",l="";return{init:function(e){n(".merlin__drawer--import-content").addClass("installing"),n(".merlin__drawer--import-content").find("input").prop("disabled",!0),o=function(){setTimeout(function(){s.removeClass(drawer_opened)},500),setTimeout(function(){n(".merlin__body").addClass("js--finished")},1500),setTimeout(function(){n(".merlin__body").addClass("exiting")},3400),setTimeout(function(){window.location.href=e.href},4e3)},t()}}}function s(n){var e=jQuery(n);if("yes"==e.data("done-loading"))return!1;var i=!1;e.is("input")||e.is("button")?"val":"text";return e.data("done-loading","yes"),e.addClass("merlin__button--loading"),{done:function(){i=!0,e.attr("disabled",!1)}}}var r,d={install_child:function(n){var e=new i;e.init(n)},activate_license:function(n){var e=new t;e.init(n)},install_plugins:function(n){var e=new o;e.init(n)},install_content:function(n){var e=new a;e.init(n)}};return{init:function(){r=this,n(e)},callback:function(n){console.log(n),console.log(this)}}}(jQuery);Merlin.init();
\ No newline at end of file
+var Merlin=function(e){var n={install_child:function(n){(new function(){var n,i=e(".merlin__body"),t=e("#child-theme-text");function o(e){void 0!==e.done?(setTimeout(function(){t.addClass("lead")},0),setTimeout(function(){t.addClass("success"),t.html(e.message)},600),n()):(t.addClass("lead error"),t.html(e.error))}return{init:function(t){n=function(){setTimeout(function(){e(".merlin__body").addClass("js--finished")},1500),i.removeClass(drawer_opened),setTimeout(function(){e(".merlin__body").addClass("exiting")},3500),setTimeout(function(){window.location.href=t.href},4e3)},jQuery.post(merlin_params.ajaxurl,{action:"merlin_child_theme",wpnonce:merlin_params.wpnonce},o).fail(o)}}}).init(n)},activate_license:function(n){(new function(){var n,i=e(".merlin__body"),t=e("#child-theme-text");function o(e){void 0!==e.done?(setTimeout(function(){t.addClass("lead")},0),setTimeout(function(){t.addClass("success"),t.html(e.message)},600),n()):(t.addClass("lead error"),t.html(e.error))}return{init:function(t){n=function(){setTimeout(function(){e(".merlin__body").addClass("js--finished")},1500),i.removeClass(drawer_opened),setTimeout(function(){e(".merlin__body").addClass("exiting")},3500),setTimeout(function(){window.location.href=t.href},4e3)},childThemeName=e("#theme_license_key").val(),jQuery.post(merlin_params.ajaxurl,{action:"merlin_activate_license",wpnonce:merlin_params.wpnonce,cThemeName:childThemeName},o).fail(o)}}}).init(n)},install_plugins:function(n){(new function(){var n,i,t=e(".merlin__body"),o=0,a="",s="";function r(e){"object"==typeof e&&void 0!==e.message?(i.find("span").text(e.message),void 0!==e.url?e.hash==s?(i.find("span").text("failed"),d()):(s=e.hash,jQuery.post(e.url,e,function(e){l()}).fail(r)):(e.done,d())):(i.find("span").text("Success"),d())}function l(){a&&jQuery.post(merlin_params.ajaxurl,{action:"merlin_plugins",wpnonce:merlin_params.wpnonce,slug:a},r).fail(r)}function d(){var t=!1;i&&(i.data("done_item")||(o++,i.data("done_item",1)),i.find(".spinner").css("visibility","hidden"));var s=e(".merlin__drawer--install-plugins li");s.each(function(){""==a||t?(a=e(this).data("slug"),i=e(this),l(),t=!1):e(this).data("slug")==a&&(t=!0)}),o>=s.length&&n()}return{init:function(i){e(".merlin__drawer--install-plugins").addClass("installing"),n=function(){setTimeout(function(){e(".merlin__body").addClass("js--finished")},1e3),t.removeClass(drawer_opened),setTimeout(function(){e(".merlin__body").addClass("exiting")},3e3),setTimeout(function(){window.location.href=i.href},3500)},d()}}}).init(n)},install_content:function(n){(new function(){var n,i,t=e(".merlin__body"),o=0,a="",s="";function r(e){var n=i.find("label");"object"==typeof e&&void 0!==e.message?(n.addClass(e.message.toLowerCase()),void 0!==e.url?e.hash===s?(n.addClass("status--failed"),l()):(s=e.hash,jQuery.post(e.url,e,r).fail(r)):(e.done,l())):(console.log(e),n.addClass("status--error"),l())}function l(){var t=!1;i&&(i.data("done_item")||(o++,i.data("done_item",1)),i.find(".spinner").css("visibility","hidden"));var s=e(".merlin__drawer--import-content__list-item");e(".merlin__drawer--import-content__list-item input:checked");s.each(function(){""==a||t?(a=e(this).data("content"),i=e(this),function(){if(a){var n=i.find("input:checkbox");n.is(":checked")?jQuery.post(merlin_params.ajaxurl,{action:"merlin_content",wpnonce:merlin_params.wpnonce,content:a,selected_index:e(".js-merlin-demo-import-select").val()||0},r).fail(r):(i.addClass("skipping"),setTimeout(l,300))}}(),t=!1):e(this).data("content")==a&&(t=!0)}),o>=s.length&&n()}return{init:function(i){e(".merlin__drawer--import-content").addClass("installing"),e(".merlin__drawer--import-content").find("input").prop("disabled",!0),n=function(){e.post(merlin_params.ajaxurl,{action:"merlin_import_finished",wpnonce:merlin_params.wpnonce,selected_index:e(".js-merlin-demo-import-select").val()||0}),setTimeout(function(){t.removeClass(drawer_opened)},500),setTimeout(function(){e(".merlin__body").addClass("js--finished")},1500),setTimeout(function(){e(".merlin__body").addClass("exiting")},3400),setTimeout(function(){window.location.href=i.href},4e3)},l()}}}).init(n)}};function i(){var i=e(".merlin__body"),t=(e(".merlin__body--loading"),e(".merlin__body--exiting"),e("#merlin__drawer-trigger"));drawer_opened="merlin__drawer--open",setTimeout(function(){i.addClass("loaded")},100),t.on("click",function(){i.toggleClass(drawer_opened)}),e(".merlin__button--proceed:not(.merlin__button--closer)").click(function(e){e.preventDefault();var n=this.getAttribute("href");i.addClass("exiting"),setTimeout(function(){window.location=n},400)}),e(".merlin__button--closer").on("click",function(e){i.removeClass(drawer_opened),e.preventDefault();var n=this.getAttribute("href");setTimeout(function(){i.addClass("exiting")},600),setTimeout(function(){window.location=n},1100)}),e(".button-next").on("click",function(i){if(i.preventDefault(),!function(e){var n=jQuery(e);if("yes"==n.data("done-loading"))return!1;n.is("input")||n.is("button");return n.data("done-loading","yes"),n.addClass("merlin__button--loading"),{done:function(){!0,n.attr("disabled",!1)}}}(this))return!1;var t=e(this).data("callback");return!t||void 0===n[t]||(n[t](this),!1)}),e(document).on("change",".js-merlin-demo-import-select",function(){var n=e(this).val(),i=e(this).children(":selected");i.data("img-src"),i.data("notice"),i.data("preview-url");e.post(merlin_params.ajaxurl,{action:"merlin_update_selected_import_data_info",wpnonce:merlin_params.wpnonce,selected_index:n},function(n){n.success?e(".js-merlin-drawer-import-content").html(n.data):alert(merlin_params.texts.something_went_wrong)}).fail(function(){alert(merlin_params.texts.something_went_wrong)})})}return{init:function(){this,e(i)},callback:function(e){console.log(e),console.log(this)}}}(jQuery);Merlin.init();
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index d778b6f..4367163 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -26,7 +26,7 @@ var merlinCssFiles          = './assets/css/**/*.css'; // Path to main .scss fil
 var merlinStyleWatchFiles   = './assets/scss/**/*.scss'; // Path to all *.scss files inside css folder and inside them.
 
 // Scripts.
-var merlinScriptSRC         = './assets/js/*.js'; // Path to JS custom scripts folder.
+var merlinScriptSRC         = './assets/js/merlin.js'; // Path to JS custom scripts folder.
 var merlinScriptDestination = './assets/js/'; // Path to place the compiled JS custom scripts file.
 var merlinScriptFile        = 'merlin'; // Compiled JS file name.
 var merlinScriptWatchFiles  = './assets/js/*.js'; // Path to all *.scss files inside css folder and inside them.
@@ -134,8 +134,6 @@ gulp.task('styles', function () {
 
 gulp.task( 'scripts', function() {
 	gulp.src( merlinScriptSRC )
-	.pipe( lineec() )
-	.pipe( gulp.dest( merlinScriptDestination ) )
 	.pipe( rename( {
 		basename: merlinScriptFile,
 		suffix: '.min'