diff --git a/makefile.js b/makefile.js
index cdf8db55..085e7dc0 100644
--- a/makefile.js
+++ b/makefile.js
@@ -98,7 +98,7 @@ module.exports = function (make) {
 	make.target('lint', [], 'lint all JavaScript files with JSHint')
 		.sync(function () {
 
-			$(src + '/_h5ai/js: **/*.js, ! *.min.js, ! inc/lib/**')
+			$(src + '/_h5ai/js: **/*.js, ! lib/**')
 				.jshint(jshint);
 		});
 
diff --git a/src/_h5ai/js/inc/core/event.js b/src/_h5ai/js/inc/core/event.js
index c6cb387a..81ce4284 100644
--- a/src/_h5ai/js/inc/core/event.js
+++ b/src/_h5ai/js/inc/core/event.js
@@ -13,7 +13,7 @@ modulejs.define('core/event', ['amplify'], function (amplify) {
 
 		pub = function (topic, data) {
 
-			console.log('EVENT PUB', topic, data);
+			// console.log('EVENT PUB', topic, data);
 			amplify.publish(topic, data);
 		};
 
diff --git a/src/_h5ai/js/inc/main.js b/src/_h5ai/js/inc/main.js
deleted file mode 100644
index 33e6abdf..00000000
--- a/src/_h5ai/js/inc/main.js
+++ /dev/null
@@ -1,71 +0,0 @@
-
-(function ($) {
-	'use strict';
-
-
-	// @include "core/ajax.js"
-	// @include "core/entry.js"
-	// @include "core/event.js"
-	// @include "core/format.js"
-	// @include "core/langs.js"
-	// @include "core/parser.js"
-	// @include "core/refresh.js"
-	// @include "core/resource.js"
-	// @include "core/settings.js"
-	// @include "core/store.js"
-	// @include "core/types.js"
-
-	// @include "model/entry.js"
-
-	// @include "parser/apache-autoindex.js"
-	// @include "parser/generic-json.js"
-
-	// @include "view/extended.js"
-	// @include "view/spacing.js"
-	// @include "view/viewmode.js"
-
-	// @include "ext/autorefresh.js"
-	// @include "ext/crumb.js"
-	// @include "ext/custom.js"
-	// @include "ext/delete.js"
-	// @include "ext/download.js"
-	// @include "ext/dropbox.js"
-	// @include "ext/filter.js"
-	// @include "ext/folderstatus.js"
-	// @include "ext/google-analytics.js"
-	// @include "ext/l10n.js"
-	// @include "ext/link-hover-states.js"
-	// @include "ext/mode.js"
-	// @include "ext/preview-img.js"
-	// @include "ext/preview-txt.js"
-	// @include "ext/qrcode.js"
-	// @include "ext/select.js"
-	// @include "ext/sort.js"
-	// @include "ext/statusbar.js"
-	// @include "ext/thumbnails.js"
-	// @include "ext/title.js"
-	// @include "ext/tree.js"
-
-	// @include "h5ai-info.js"
-	// @include "h5ai-main.js"
-
-
-	$(function () {
-		/*global H5AI_CONFIG, amplify, Base64, jQuery, Modernizr, moment, _ */
-
-		// Register predefined globals on doc ready, so the script order inside
-		// the document doesn't matter. `jQuery`, `moment` and `underscore` are
-		// itself functions, so they have to be wrapped to not be handled as
-		// constructors.
-		modulejs.define('config', H5AI_CONFIG);
-		modulejs.define('amplify', amplify);
-		modulejs.define('base64', Base64);
-		modulejs.define('$', function () { return jQuery; });
-		modulejs.define('modernizr', Modernizr);
-		modulejs.define('moment', function () { return moment; });
-		modulejs.define('_', function () { return _; });
-
-		modulejs.require($('body').attr('id'));
-	});
-
-}(jQuery));
diff --git a/src/_h5ai/js/markdown.js b/src/_h5ai/js/markdown.js
index feb72b87..27be65e6 100644
--- a/src/_h5ai/js/markdown.js
+++ b/src/_h5ai/js/markdown.js
@@ -1,2 +1,2 @@
 
-// @include "lib/markdown-0.4.0.js"
+// @include "lib/markdown-*.js"
diff --git a/src/_h5ai/js/modernizr.js b/src/_h5ai/js/modernizr.js
index bd219c57..4db8d9a1 100644
--- a/src/_h5ai/js/modernizr.js
+++ b/src/_h5ai/js/modernizr.js
@@ -1,2 +1,2 @@
 
-// @include "lib/modernizr-2.6.1.min.js"
+// @include "lib/modernizr-*.js"
diff --git a/src/_h5ai/js/scripts.js b/src/_h5ai/js/scripts.js
index c705a392..2b3928df 100644
--- a/src/_h5ai/js/scripts.js
+++ b/src/_h5ai/js/scripts.js
@@ -1,12 +1,8 @@
 
 // jQuery libs
 // -----------
-// @include "lib/jquery-1.8.0.min.js"
-// @include "lib/jquery.filedrop-0.1.0.js"
-// @include "lib/jquery.fracs-0.11.min.js"
-// @include "lib/jquery.mousewheel-3.0.6.js"
-// @include "lib/jquery.qrcode-0.2.min.js"
-// @include "lib/jquery.scrollpanel-0.1.min.js"
+// @include "lib/jquery-*.js"
+// @include "lib/jquery.*.js"
 
 // other libs
 // ----------
@@ -20,4 +16,25 @@
 
 // h5ai
 // ----
-// @include "inc/main.js"
+(function ($) {
+	'use strict';
+
+	// @include "inc/**/*.js"
+
+	$(function () {
+		/*global H5AI_CONFIG, amplify, Base64, jQuery, Modernizr, moment, _ */
+
+		// `jQuery`, `moment` and `underscore` are itself functions,
+		// so they have to be wrapped to not be handled as constructors.
+		modulejs.define('config', H5AI_CONFIG);
+		modulejs.define('amplify', amplify);
+		modulejs.define('base64', Base64);
+		modulejs.define('$', function () { return jQuery; });
+		modulejs.define('modernizr', Modernizr);
+		modulejs.define('moment', function () { return moment; });
+		modulejs.define('_', function () { return _; });
+
+		modulejs.require($('body').attr('id'));
+	});
+
+}(jQuery));
diff --git a/src/_h5ai/js/syntaxhighlighter.js b/src/_h5ai/js/syntaxhighlighter.js
index 30955b80..1e2954bf 100644
--- a/src/_h5ai/js/syntaxhighlighter.js
+++ b/src/_h5ai/js/syntaxhighlighter.js
@@ -1,30 +1,3 @@
 
 // @include "lib/sh/shCore.js"
-// @-include "lib/sh/shLegacy.js"
-// @-include "lib/sh/shAutoloader.js"
-
-// @include "lib/sh/shBrushAS3.js"
-// @include "lib/sh/shBrushAppleScript.js"
-// @include "lib/sh/shBrushBash.js"
-// @include "lib/sh/shBrushCSharp.js"
-// @include "lib/sh/shBrushColdFusion.js"
-// @include "lib/sh/shBrushCpp.js"
-// @include "lib/sh/shBrushCss.js"
-// @include "lib/sh/shBrushDelphi.js"
-// @include "lib/sh/shBrushDiff.js"
-// @include "lib/sh/shBrushErlang.js"
-// @include "lib/sh/shBrushGroovy.js"
-// @include "lib/sh/shBrushJScript.js"
-// @include "lib/sh/shBrushJava.js"
-// @include "lib/sh/shBrushJavaFX.js"
-// @include "lib/sh/shBrushPerl.js"
-// @include "lib/sh/shBrushPhp.js"
-// @include "lib/sh/shBrushPlain.js"
-// @include "lib/sh/shBrushPowerShell.js"
-// @include "lib/sh/shBrushPython.js"
-// @include "lib/sh/shBrushRuby.js"
-// @include "lib/sh/shBrushSass.js"
-// @include "lib/sh/shBrushScala.js"
-// @include "lib/sh/shBrushSql.js"
-// @include "lib/sh/shBrushVb.js"
-// @include "lib/sh/shBrushXml.js"
+// @include "lib/sh/shBrush*.js"