diff --git a/.gitignore b/.gitignore
index f67beaab..37d00333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ node_modules/
 *_i.c
 *_p.c
 *.ilk
+*.log
 *.meta
 *.obj
 *.pch
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 00000000..32423c57
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,325 @@
+/*global module:false*/
+module.exports = function( grunt ) {
+	'use strict';
+
+	var pkg = grunt.file.readJSON( 'package.json' ),
+		tasks,
+		widgetFilePrefix,
+		widgetFileSuffix,
+
+		defaults = {
+			dependencies : {
+				widgets: {
+					'saveSort resizable pager filter columnSelector' : 'storage',
+					'filter-formatter-html5 filter-formatter-jui filter-formatter-select2' : 'filter'
+					// 'stickyHeaders' : 'addResizeEvent' // included with stickyHeaders widget (for now)
+				}
+			},
+			standardWidgets: [
+				'storage', // req by saveSort; optional in others
+				'uitheme',
+				'columns',
+				'filter',
+				'stickyHeaders',
+				'resizable',
+				'saveSort'
+				// 'addResizeEvent', // included with stickyHeaders widget
+				// 'zeba' // included in core
+			]
+		},
+
+		// example widgets = [ 'pager','column', 'filter', 'stickyHeaders' ];
+		addWidgetDependencies = function(widgets) {
+			var indx, dep,
+				maxDeps = 40, // just in case (there are currently 27 widgets)
+				len = widgets.length,
+				deps = defaults.dependencies.widgets;
+			for ( dep in deps ) {
+				if ( typeof dep === 'string' ) {
+					for ( indx = 0; indx < len; indx++ ) {
+						// make sure indexOf is not matching "column" instead of "columnSelector" with surrounding spaces
+						if ( (' ' + dep + ' ').indexOf(' ' + widgets[indx] + ' ') >= 0 && widgets.indexOf( deps[dep] ) < 0 ) {
+							widgets.push( deps[dep] );
+							// keep checking newly added widgets, in case "filter" is added and "storage" hasn't been
+							if (len < maxDeps) { len++; }
+							continue;
+						}
+					}
+				}
+			}
+			return widgets;
+		},
+		formFileNames = function(){
+			// add widget path & file extension
+			pkg.processedWidgets = ( widgetFilePrefix +
+				pkg.selectedWidgets.join( widgetFileSuffix + ',' + widgetFilePrefix ) +
+				widgetFileSuffix ).split( ',' );
+			console.info( 'Creating a widgets file with: ' + pkg.selectedWidgets.join(', ') );
+		};
+
+	// minified banner template - updated 2/9/2015 (v2.19.1)
+	pkg.banner = '/*! <%= pkg.name %> (FORK) widgets - updated ' +
+		'<%= grunt.template.today("mm-dd-yyyy") %> (v<%= pkg.version %>)*/\n';
+
+	widgetFilePrefix = 'js/widgets/widget-';
+	widgetFileSuffix = '.js';
+
+	pkg.buildWidget = 'dist/js/jquery.tablesorter.widgets.js';
+
+	// Project configuration.
+	grunt.initConfig({
+		pkg: pkg,
+
+		clean: {
+			build: {
+				src: [ 'dist/**/**/**/*', 'dist/**/**/*', 'dist/**/*', 'dist' ]
+			},
+			cleancss: {
+				src: [ 'dist/temp/*', 'dist/temp', 'dist/css/*.css', '!dist/css/*.min.css' ]
+			}
+		},
+
+		copy: {
+			main: {
+				expand: true,
+				src: [
+					'js/jquery.*.js',
+					'!js/_test-*.js',
+					'!js/*.min.js',
+				],
+				dest: 'dist/',
+				filter: 'isFile'
+			},
+			css: {
+				files : [{
+					expand: true,
+					dot: true,
+					flatten: true,
+					src: ['css/*.css', 'addons/pager/*.css'],
+					dest: 'dist/temp/',
+					rename: function(dest, src) {
+						return dest + src.replace( /\./g, '+' ).replace( /\+css/g, '.css' );
+					}
+				}]
+			},
+			less: {
+				expand: true,
+				flatten: true,
+				src:  'css/*.less',
+				dest: 'dist/css/less/'
+			},
+			images: {
+				expand: true,
+				flatten: true,
+				src:  [ 'addons/pager/icons/*', 'css/images/*' ],
+				dest: 'dist/css/images/'
+			},
+			fixnames: {
+				files : [{
+					expand: true,
+					dot: true,
+					flatten: true,
+					src: ['dist/temp/*.css'],
+					dest: 'dist/css/',
+					rename: function(dest, src) {
+						return dest + src.replace( /\+/g, '.' );
+					}
+				}]
+			}
+		},
+
+		concat: {
+			widgets: {
+				options: {
+					banner: '<%= pkg.banner %>/* Includes: <%= pkg.selectedWidgets %> */\n'
+				},
+				src: [
+					'<%= pkg.processedWidgets %>',
+					'!js/widgets/_test-*.js',
+					'!js/widgets/*.min.js'
+				],
+				dest: '<%= pkg.buildWidget %>'
+			},
+			// keep all the existing jsFiddle demos from breaking
+			copyback: {
+				options: {
+					banner: '/*** This file is dynamically generated ***\n' +
+					'█████▄ ▄████▄   █████▄ ▄████▄ ██████   ███████▄ ▄████▄ █████▄ ██ ██████ ██  ██\n' +
+					'██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██     ██  ██\n' +
+					'██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██\n' +
+					'█████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀\n*/\n'
+				},
+				src : ['<%= pkg.buildWidget %>'],
+				dest: 'js/jquery.tablesorter.widgets.js'
+			}
+		},
+
+		jshint: {
+			files: {
+				src: [
+				'addons/pager/*.js',
+				'!addons/pager/*.min.js',
+				'js/jquery.*.js',
+				'js/**/*.js',
+				'!js/_test-*.js',
+				'!js/**/_test-*.js',
+				'!js/*.min.js',
+				'!js/**/semver*.js'
+				]
+			},
+			options: {
+				globals: {
+					"localStorage": false,
+					"navigator": false,
+					"console": false,
+					"alert": false
+				},
+				"loopfunc": true,
+				"jquery": true,
+				"browser": true
+			}
+		},
+
+		uglify: {
+			options: {
+				preserveComments: 'some',
+				report: 'gzip'
+			},
+			allFiles: {
+				files: [
+					{
+						expand: true,
+						cwd: './js/', // Src matches are relative to this path.
+						src: [
+							'*.js',
+							'**/*.js',
+							'!_test-*.js',
+							'!**/_test-*.js',
+							'!*.min.js',
+							'!**/semver.js'
+						],
+						dest: 'dist/js/',
+						ext: '.min.js', // Dist files will have this extension.
+						extDot: 'last'  // Extensions in filenames begin after the first dot
+					}
+				]
+			},
+			pageraddon: {
+				files: {
+					'dist/js/extras/jquery.tablesorter.pager.min.js': [ 'addons/pager/*.js' ]
+				}
+			}
+		},
+
+		cssmin: {
+			target: {
+				files: [{
+					expand: true,
+					flatten: true,
+					cwd: 'dist/temp',
+					src: ['*.css'],
+					dest: 'dist/temp',
+					ext: '.min.css'
+				}]
+			}
+		},
+
+		qunit: {
+			files: [ 'test.html' ]
+		},
+
+		watch: {
+			scripts: {
+				files: [
+					'js/*.js',
+					'js/**/*.js',
+					'!js/_test-*.js',
+					'!js/*.min.js'
+				],
+				tasks: [ 'build' ]
+			}
+		}
+
+	});
+
+	grunt.loadNpmTasks( 'grunt-contrib-clean' );
+	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+	grunt.loadNpmTasks( 'grunt-contrib-qunit' );
+	grunt.loadNpmTasks( 'grunt-contrib-concat' );
+	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
+	grunt.loadNpmTasks( 'grunt-contrib-copy' );
+	grunt.loadNpmTasks( 'grunt-contrib-watch' );
+	grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
+
+	grunt.registerTask( 'test', [ 'jshint', 'qunit' ] );
+
+	/* grunt-contrib-cssmin does not work with multiple periods in the file name.
+	 * see https://github.com/gruntjs/grunt-contrib-cssmin/issues/175
+	 * Css files are copied to 'dist/temp' folder & '.' are replaced with '+'.
+	 * Css files are minified & copied to 'dist/css'.
+	 * 'dist/temp' is deleted.
+	 */
+	tasks = [
+		'clean:build',
+		'copy:main',
+		'copy:css',
+		'copy:less',
+		'copy:images',
+		'concat',
+		'jshint',
+		'uglify',
+		'cssmin',
+		'copy:fixnames',
+		'clean:cleancss',
+		'updateManifest'
+	];
+
+	// basic = same as before: core, widgets, filterformatter all separate
+	grunt.registerTask( 'default', 'Default build', function(){
+		pkg.selectedWidgets = addWidgetDependencies( defaults.standardWidgets );
+		formFileNames();
+		grunt.task.run(tasks);
+	});
+
+	// enter "grunt custom:{filename}" (not including the ".json")
+	// to load in a custom json file
+	// the expected JSON format is (with custom widgets in a string):
+	// { "widgets" : "columnHighlight filter resizable saveSort stickyHeaders uitheme" }
+	grunt.registerTask( 'custom', 'Custom build', function(file){
+		var temp, deps = true;
+
+		/* Allow developer to set up a custom widget build (json file will have settings)*/
+		try {
+			temp = grunt.file.readJSON( file );
+			if (temp) {
+				deps = ('includeDependencies' in temp) ? temp.includeDependencies : true;
+				temp = temp.widgets.split(/\s+/);
+			}
+		} catch (err) {
+			grunt.log.error('Custom build json not found - Use "grunt custom:{filename}" (no .json ending)');
+			temp = defaults.standardWidgets;
+		}
+
+		// add dependencies
+		pkg.selectedWidgets = deps ? addWidgetDependencies( temp ) : temp;
+		formFileNames();
+		grunt.task.run(tasks);
+	});
+
+	// update bower.json & tablesorter.jquery.json file version numbers to match the package.json version
+	grunt.registerTask( 'updateManifest', function() {
+		var i, project,
+			projectFile = [ 'tablesorter.jquery.json', 'bower.json' ],
+			len = projectFile.length;
+		for ( i = 0; i < len; i++ ) {
+			if ( !grunt.file.exists( projectFile[ i ] ) ) {
+				grunt.log.error( "file " + projectFile[ i ] + " not found" );
+				return true; // return false to abort the execution
+			}
+			project = grunt.file.readJSON( projectFile[ i ] ); // get file as json object
+			project.version = pkg.version;
+			grunt.file.write( projectFile[i], JSON.stringify( project, null, 2 ) ); // serialize it back to file
+		}
+	});
+
+};
diff --git a/bower.json b/bower.json
index 675aab07..64360d07 100644
--- a/bower.json
+++ b/bower.json
@@ -4,5 +4,8 @@
   "dependencies": {
     "jquery": ">=1.2.6"
   },
-  "main": "js/jquery.tablesorter.js"
-}
+  "main": [
+    "js/jquery.tablesorter.js",
+    "js/jquery.tablesorter.widgets.js"
+  ]
+}
\ No newline at end of file
diff --git a/css/theme.black-ice.css b/css/theme.black-ice.css
index 1b38c528..00ee11d6 100644
--- a/css/theme.black-ice.css
+++ b/css/theme.black-ice.css
@@ -79,7 +79,7 @@
 .tablesorter-blackice .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.blue.css b/css/theme.blue.css
index 662b185f..440fa499 100644
--- a/css/theme.blue.css
+++ b/css/theme.blue.css
@@ -114,7 +114,7 @@
 .tablesorter-blue .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.dark.css b/css/theme.dark.css
index adca809b..b7e7c7f6 100644
--- a/css/theme.dark.css
+++ b/css/theme.dark.css
@@ -78,7 +78,7 @@
 .tablesorter-dark .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.default.css b/css/theme.default.css
index 20fc153b..2fea9067 100644
--- a/css/theme.default.css
+++ b/css/theme.default.css
@@ -81,7 +81,7 @@ Default Theme
 .tablesorter-default .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.dropbox.css b/css/theme.dropbox.css
index e48b1696..11e65a21 100644
--- a/css/theme.dropbox.css
+++ b/css/theme.dropbox.css
@@ -111,7 +111,7 @@
 .tablesorter-dropbox .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.green.css b/css/theme.green.css
index f839af36..1e54a7a1 100644
--- a/css/theme.green.css
+++ b/css/theme.green.css
@@ -96,7 +96,7 @@
 .tablesorter-green .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.grey.css b/css/theme.grey.css
index 540c35da..9fe9b678 100644
--- a/css/theme.grey.css
+++ b/css/theme.grey.css
@@ -132,7 +132,7 @@
 .tablesorter-grey .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.ice.css b/css/theme.ice.css
index 25192eb0..2bd7afb3 100644
--- a/css/theme.ice.css
+++ b/css/theme.ice.css
@@ -88,7 +88,7 @@
 .tablesorter-ice .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.jui.css b/css/theme.jui.css
index 17e53c34..aaeea2c8 100644
--- a/css/theme.jui.css
+++ b/css/theme.jui.css
@@ -71,7 +71,7 @@
 .tablesorter-jui .tablesorter-processing .tablesorter-header-inner {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url('data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=') !important;
 }
 
diff --git a/css/theme.metro-dark.css b/css/theme.metro-dark.css
index 7649bb87..6a1edb54 100644
--- a/css/theme.metro-dark.css
+++ b/css/theme.metro-dark.css
@@ -79,7 +79,7 @@ Metro Dark Theme
 .tablesorter-metro-dark .tablesorter-processing {
 	background-position: center center !important;
 	background-repeat: no-repeat !important;
-	/* background-image: url(../addons/pager/icons/loading.gif) !important; */
+	/* background-image: url(images/loading.gif) !important; */
 	background-image: url(data:image/gif;base64,R0lGODlhFAAUAKEAAO7u7lpaWgAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQBCgACACwAAAAAFAAUAAACQZRvoIDtu1wLQUAlqKTVxqwhXIiBnDg6Y4eyx4lKW5XK7wrLeK3vbq8J2W4T4e1nMhpWrZCTt3xKZ8kgsggdJmUFACH5BAEKAAIALAcAAAALAAcAAAIUVB6ii7jajgCAuUmtovxtXnmdUAAAIfkEAQoAAgAsDQACAAcACwAAAhRUIpmHy/3gUVQAQO9NetuugCFWAAAh+QQBCgACACwNAAcABwALAAACE5QVcZjKbVo6ck2AF95m5/6BSwEAIfkEAQoAAgAsBwANAAsABwAAAhOUH3kr6QaAcSrGWe1VQl+mMUIBACH5BAEKAAIALAIADQALAAcAAAIUlICmh7ncTAgqijkruDiv7n2YUAAAIfkEAQoAAgAsAAAHAAcACwAAAhQUIGmHyedehIoqFXLKfPOAaZdWAAAh+QQFCgACACwAAAIABwALAAACFJQFcJiXb15zLYRl7cla8OtlGGgUADs=) !important;
 }
 
diff --git a/docs/example-meta-headers.html b/docs/example-meta-headers.html
index fdf3b37f..d839eed3 100644
--- a/docs/example-meta-headers.html
+++ b/docs/example-meta-headers.html
@@ -19,7 +19,7 @@
 
 	<!-- Tablesorter: optional -->
 	<script src="../addons/pager/jquery.tablesorter.pager.js"></script>
-	<script src="../js/jquery.metadata.js"></script>
+	<script src="../js/extras/jquery.metadata.js"></script>
 
 	<script>
 		// not sure why this is here...
@@ -106,7 +106,7 @@
 &lt;script src=&quot;../js/jquery.tablesorter.js&quot;&gt;&lt;/script&gt;
 
 &lt;!-- Tablesorter: optional (but required for this demo) --&gt;
-&lt;script src=&quot;../js/jquery.metadata.js&quot;&gt;&lt;/script&gt;</pre>
+&lt;script src=&quot;../js/extras/jquery.metadata.js&quot;&gt;&lt;/script&gt;</pre>
 	</div>
 	<h1>Javascript</h1>
 	<div id="javascript">
diff --git a/docs/example-meta-parsers.html b/docs/example-meta-parsers.html
index 7b7064cd..ed985257 100644
--- a/docs/example-meta-parsers.html
+++ b/docs/example-meta-parsers.html
@@ -16,7 +16,7 @@
 	<!-- Tablesorter: required -->
 	<link rel="stylesheet" href="../css/theme.blue.css">
 	<script src="../js/jquery.tablesorter.js"></script>
-	<script src="../js/jquery.metadata.js"></script>
+	<script src="../js/extras/jquery.metadata.js"></script>
 	<script src="../addons/pager/jquery.tablesorter.pager.js"></script>
 
 	<script id="js">$(function() {
@@ -99,7 +99,7 @@
 &lt;script src=&quot;../js/jquery.tablesorter.js&quot;&gt;&lt;/script&gt;
 
 &lt;!-- Tablesorter: optional (but required for this demo) --&gt;
-&lt;script src=&quot;../js/jquery.metadata.js&quot;&gt;&lt;/script&gt;</pre>
+&lt;script src=&quot;../js/extras/jquery.metadata.js&quot;&gt;&lt;/script&gt;</pre>
 	</div>
 	<h1>Javascript</h1>
 	<div id="javascript">
diff --git a/docs/example-meta-sort-list.html b/docs/example-meta-sort-list.html
index 04a27664..ec2b3410 100644
--- a/docs/example-meta-sort-list.html
+++ b/docs/example-meta-sort-list.html
@@ -18,7 +18,7 @@
 	<script src="../js/jquery.tablesorter.js"></script>
 
 	<!-- Tablesorter: optional (but required for this demo) -->
-	<script src="../js/jquery.metadata.js"></script>
+	<script src="../js/extras/jquery.metadata.js"></script>
 
 	<script id="js">$(function() {
 	// call the tablesorter plugin, the magic happens in the markup
@@ -101,7 +101,7 @@
 &lt;script src=&quot;../js/jquery.tablesorter.js&quot;&gt;&lt;/script&gt;
 
 &lt;!-- Tablesorter: optional (but required for this demo) --&gt;
-&lt;script src=&quot;../js/jquery.metadata.js&quot;&gt;&lt;/script&gt;</pre>
+&lt;script src=&quot;../js/extras/jquery.metadata.js&quot;&gt;&lt;/script&gt;</pre>
 	</div>
 	<h1>Javascript</h1>
 	<div id="javascript">
diff --git a/docs/example-pager-ajax.html b/docs/example-pager-ajax.html
index 9f0b0d67..176c1f47 100644
--- a/docs/example-pager-ajax.html
+++ b/docs/example-pager-ajax.html
@@ -374,7 +374,7 @@ td.pager {
 		<pre class="prettyprint lang-html">&lt;table class=&quot;tablesorter&quot;&gt;
   &lt;thead&gt;
     &lt;tr&gt;
-      &lt;td class=&quot;pager sorter-false&quot; colspan=&quot;5&quot;&gt;
+      &lt;td class=&quot;pager&quot; colspan=&quot;5&quot;&gt;
         &lt;img src=&quot;../addons/pager/icons/first.png&quot; class=&quot;first&quot;/&gt;
         &lt;img src=&quot;../addons/pager/icons/prev.png&quot; class=&quot;prev&quot;/&gt;
         &lt;span class=&quot;pagedisplay&quot;&gt;&lt;/span&gt; &lt;!-- this can be any element, including an input --&gt;
diff --git a/docs/example-widget-filter-formatter-1.html b/docs/example-widget-filter-formatter-1.html
index f28ac050..bfd42576 100644
--- a/docs/example-widget-filter-formatter-1.html
+++ b/docs/example-widget-filter-formatter-1.html
@@ -34,7 +34,7 @@
 	<link href="../css/filter.formatter.css" rel="stylesheet">
 	<script src="../js/jquery.tablesorter.js"></script>
 	<script src="../js/jquery.tablesorter.widgets.js"></script>
-	<script src="../js/jquery.tablesorter.widgets-filter-formatter.js"></script>
+	<script src="../js/widgets/widget-filter-formatter-jui.js"></script>
 	<script>
 	$(function(){
 
@@ -246,7 +246,7 @@
 				<li>In <span class="version">v2.10.1</span> the <code>compare</code> option was added. This allows comparing the slider's value to the column value. The slider in the Age column is selecting values greater than or equal to itself.</li>
 				<li>A search delay was added in v2.7.11 (time set by <code>filter_searchDelay</code> option). It can be disabled by setting the <code>delayed</code> option to <code>false</code>.<br><br></li>
 				<li>This example shows how you can add a jQuery UI slider to filter column content.</li>
-				<li>The <code>filter_formatter</code> function provided in the extra "jquery.tablesorter.widgets-filter-formatter.js" file is used to add this custom control within the filter row.</li>
+				<li>The <code>filter_formatter</code> function provided in the extra "widget-filter-formatter-jui.js" file is used to add this custom control within the filter row.</li>
 				<li>Make sure to include all values within the selected range, otherwise rows outside of this range will be forever hidden.</li>
 				<li>Add the following code to apply a slider to filter a column:<pre class="prettyprint lang-javascript">$(function() {
 
@@ -313,7 +313,7 @@
 		<div>
 			<ul>
 				<li>This example shows how you can add a jQuery UI range slider to filter column content.</li>
-				<li>The <code>filter_formatter</code> function provided in the extra "jquery.tablesorter.widgets-filter-formatter.js" file is used to add this custom control within the filter row.</li>
+				<li>The <code>filter_formatter</code> function provided in the extra "widget-filter-formatter-jui.js" file is used to add this custom control within the filter row.</li>
 				<li>Make sure to include all values within the selected range, otherwise rows outside of this range will be forever hidden.</li>
 				<li>The range slider is actually the same as the single slider described above, but was built to handle a range of values.</li>
 				<li>Add the following code to apply a range slider to filter a column:<pre class="prettyprint lang-javascript">$(function() {
@@ -359,7 +359,7 @@
 			<ul>
 				<li>In <span class="version">v2.15.0</span> the <code>compare</code> option was updated to allow adding a selector along with the input. The <code>selected</code> option allows choosing the default setting.<br><br></li>
 				<li>This example shows how you can add a jQuery UI spinner to filter column content.</li>
-				<li>The <code>filter_formatter</code> function provided in the extra "jquery.tablesorter.widgets-filter-formatter.js" file is used to add this custom control within the filter row.</li>
+				<li>The <code>filter_formatter</code> function provided in the extra "widget-filter-formatter-jui.js" file is used to add this custom control within the filter row.</li>
 				<li>Add the following code to apply a spinner to filter a column:<pre class="prettyprint lang-javascript">$(function() {
 
   $("table").tablesorter({
@@ -413,7 +413,7 @@
 					<br>
 				</li>
 				<li>This example shows how you can add a jQuery UI Datepicker to compare to filter column content.</li>
-				<li>The <code>filter_formatter</code> function provided in the extra "jquery.tablesorter.widgets-filter-formatter.js" file is used to add this custom control within the filter row.</li>
+				<li>The <code>filter_formatter</code> function provided in the extra "widget-filter-formatter-jui.js" file is used to add this custom control within the filter row.</li>
 				<li>This code follows the <a class="external" href="http://jqueryui.com/datepicker/#default">default functionality</a> example from the jQuery UI docs.</li>
 				<li>Add the following code to apply a datepicker comparison selector to the filter row:<pre class="prettyprint lang-javascript">$(function() {
 
@@ -475,7 +475,7 @@
 				</li>
 				<li>In <span class="version">v2.15.0</span>, an <code>endOfDay</code> option was added, which when <code>true</code> and searching within one day, all times within that selected day will be included - try searching for <button data-column="5" data-value="1/20/2014 - 1/20/2014">1/20/2014 - 1/20/2014</button> to note that the day include various times.<br></li>
 				<li>This example shows how you can add a jQuery UI Datepicker range to filter column content.</li>
-				<li>The <code>filter_formatter</code> function provided in the extra "jquery.tablesorter.widgets-filter-formatter.js" file is used to add this custom control within the filter row.</li>
+				<li>The <code>filter_formatter</code> function provided in the extra "widget-filter-formatter-jui.js" file is used to add this custom control within the filter row.</li>
 				<li>This code follows the <a class="external" href="http://jqueryui.com/datepicker/#date-range">date range</a> example from the jQuery UI docs.</li>
 				<li>Updated two input functions so that if the "to" input is empty, all dates greater than the "from" date are shown. If the "from" input is empty, all dates less than the "to" input date are shown (<span class="version updated">v2.10.1</span>).</li>
 				<li>Add the following code to apply a datepicker range selector to the filter row:<pre class="prettyprint lang-javascript">$(function() {
@@ -608,7 +608,7 @@
 
 &lt;!-- filter formatter code --&gt;
 &lt;link rel=&quot;stylesheet&quot; href=&quot;../css/filter.formatter.css&quot;&gt;
-&lt;script src=&quot;../js/jquery.tablesorter.widgets-filter-formatter.js&quot;&gt;&lt;/script&gt;</pre>
+&lt;script src=&quot;../js/widgets/widget-filter-formatter-jui.js&quot;&gt;&lt;/script&gt;</pre>
 	</div>
 
 	<h1>CSS</h1>
diff --git a/docs/example-widget-filter-formatter-2.html b/docs/example-widget-filter-formatter-2.html
index 75385263..7d005c7a 100644
--- a/docs/example-widget-filter-formatter-2.html
+++ b/docs/example-widget-filter-formatter-2.html
@@ -20,7 +20,7 @@
 	<link href="../css/filter.formatter.css" rel="stylesheet">
 	<script src="../js/jquery.tablesorter.js"></script>
 	<script src="../js/jquery.tablesorter.widgets.js"></script>
-	<script src="../js/jquery.tablesorter.widgets-filter-formatter.js"></script>
+	<script src="../js/widgets/widget-filter-formatter-html5.js"></script>
 
 	<style id="css">/* css needed to get compare selector & slider in-line */
 .compare-select-wrapper { width: 60%; float: right; }</style>
@@ -140,7 +140,7 @@
 			<ul>
 				<li>In <span class="version">v2.15.0</span> the <code>compare</code> option was updated to allow adding a selector along with the input. The <code>selected</code> option allows choosing the default setting.</li>
 				<li>This example shows how you can add an HTML5 range input slider to filter column content.</li>
-				<li>The <code>filter_formatter</code> function provided in the extra "jquery.tablesorter.widgets-filter-formatter.js" file is used to add this custom control within the filter row.</li>
+				<li>The <code>filter_formatter</code> function provided in the extra "widget-filter-formatter-html5.js" file is used to add this custom control within the filter row.</li>
 				<li>Make sure to include all values within the selected range, otherwise rows outside of this range will be forever hidden.</li>
 				<li>Add the following code to apply an HTML5 range slider to the filter row:<pre class="prettyprint lang-javascript">$(function() {
 
@@ -238,7 +238,7 @@
 			<ul>
 				<li>In <span class="version">v2.15.0</span> the <code>compare</code> option was updated to allow adding a selector along with the input. The <code>selected</code> option allows choosing the default setting.</li>
 				<li>This example shows how you can add an HTML5 number spinner to the filter column content.</li>
-				<li>The <code>filter_formatter</code> function provided in the extra "jquery.tablesorter.widgets-filter-formatter.js" file is used to add this custom control within the filter row.</li>
+				<li>The <code>filter_formatter</code> function provided in the extra "widget-filter-formatter-html5.js" file is used to add this custom control within the filter row.</li>
 				<li>Add the following code to apply an HTML spinner to filter a column:<pre class="prettyprint lang-javascript">$(function() {
 
   $("table").tablesorter({
@@ -328,7 +328,7 @@
 
 &lt;!-- filter formatter code --&gt;
 &lt;link rel=&quot;stylesheet&quot; href=&quot;../css/filter.formatter.css&quot;&gt;
-&lt;script src=&quot;../js/jquery.tablesorter.widgets-filter-formatter.js&quot;&gt;&lt;/script&gt;</pre>
+&lt;script src=&quot;../js/widgets/widget-filter-formatter-html5.js&quot;&gt;&lt;/script&gt;</pre>
 	</div>
 
 	<h1>Javascript</h1>
@@ -350,4 +350,3 @@
 
 </body>
 </html>
-
diff --git a/docs/example-widget-filter-formatter-select2.html b/docs/example-widget-filter-formatter-select2.html
index 4544b139..ac3fdfa5 100644
--- a/docs/example-widget-filter-formatter-select2.html
+++ b/docs/example-widget-filter-formatter-select2.html
@@ -23,7 +23,7 @@
 	<!-- Select2 code -->
 	<link href="css/select2-3.4.6.min.css" rel="stylesheet">
 	<script src="js/select2-3.4.6.min.js"></script>
-	<script src="../js/jquery.tablesorter.widgets-filter-formatter-select2.js"></script>
+	<script src="../js/widgets/widget-filter-formatter-select2.js"></script>
 
 <script id="js">$(function(){
 
@@ -212,7 +212,7 @@
 &lt;!-- Select2 code --&gt;
 &lt;link href=&quot;http://cdnjs.cloudflare.com/ajax/libs/select2/3.4.6/select2.min.css&quot; rel=&quot;stylesheet&quot;&gt;
 &lt;script src=&quot;http://cdnjs.cloudflare.com/ajax/libs/select2/3.4.6/select2.min.js&quot;&gt;&lt;/script&gt;
-&lt;script src=&quot;../js/jquery.tablesorter.widgets-filter-formatter-select2.js&quot;&gt;&lt;/script&gt;</pre>
+&lt;script src=&quot;../js/widgets/widget-filter-formatter-select2.js&quot;&gt;&lt;/script&gt;</pre>
 	</div>
 
 	<h1>HTML</h1>
diff --git a/docs/example-widget-pager-ajax.html b/docs/example-widget-pager-ajax.html
index 5ac78af6..3e8d1c48 100644
--- a/docs/example-widget-pager-ajax.html
+++ b/docs/example-widget-pager-ajax.html
@@ -303,7 +303,7 @@ td.pager {
 &lt;table class=&quot;tablesorter&quot;&gt;
   &lt;thead&gt;
     &lt;tr&gt;
-      &lt;td class=&quot;pager sorter-false&quot; colspan=&quot;5&quot;&gt;
+      &lt;td class=&quot;pager&quot; colspan=&quot;5&quot;&gt;
         &lt;img src=&quot;../addons/pager/icons/first.png&quot; class=&quot;first&quot;/&gt;
         &lt;img src=&quot;../addons/pager/icons/prev.png&quot; class=&quot;prev&quot;/&gt;
         &lt;span class=&quot;pagedisplay&quot;&gt;&lt;/span&gt; &lt;!-- this can be any element, including an input --&gt;
diff --git a/docs/index.html b/docs/index.html
index e72fbf9f..3c1e24c7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2421,7 +2421,7 @@ $(function(){
 }</pre>
 					<span class="label label-warning">Warning</span> What <em>won't work</em> is if you try to target the header using a filtering selector that uses an index, e.g. <code>"th:eq()"</code>, <code>":gt()"</code>, <code>":lt()"</code>, <code>":first"</code>, <code>":last"</code>, <code>":even"</code> or <code>":odd"</code>, <code>":first-child"</code>, <code>":last-child"</code>, <code>":nth-child()"</code>, <code>":nth-last-child()"</code>, etc.<br>
 					<br>
-					A new file has been included named "jquery.tablesorter.widgets-filter-formatter.js". It includes code to add jQuery UI and HTML5 controls via the <a href="#widget-filter-formatter"><code>filter_formatter</code></a> option.<br>
+					A new file has been included named "widget-filter-formatter-jui.js" &amp; "widget-filter-formatter-html5.js". The files include code to add jQuery UI and HTML5 controls via the <a href="#widget-filter-formatter"><code>filter_formatter</code></a> option.<br>
 					<br>
 					Most of the formatter functions have an option named <code>valueToHeader</code> which, when <code>true</code> adds a span to the header cell above the filter row and updates it with the current control's value (see <a href="example-widget-filter-formatter-2.html">example 2</a>). If the option exists and is set to <code>false</code>, then the current value is added to the control's handle and css can be used to create a popup to show the current value (see <a href="example-widget-filter-formatter-1.html">example 1</a>).<br>
 					<br>
@@ -2698,7 +2698,7 @@ $(function(){
 					</ul>
 					The <code>filter_placeholder.select</code> setting adds the text to the first select option (default option to show all rows).<br>
 					<br>
-					<span class="label label-info">Note:</span> The <code>jquery.tablesorter.widgets-filter-formatter.js</code> jQuery UI Datepicker Range Selector creates two inputs, so this option then includes two additional settings:<br>
+					<span class="label label-info">Note:</span> The <code>widget-filter-formatter-jui.js</code> jQuery UI Datepicker Range Selector creates two inputs, so this option then includes two additional settings:<br>
 					<br>
 					<pre class="prettyprint lang-js">filter_placeholder : {
 	search : '',
diff --git a/example.json b/example.json
new file mode 100644
index 00000000..44013640
--- /dev/null
+++ b/example.json
@@ -0,0 +1,4 @@
+{
+  "widgets" : "filter stickyHeaders uitheme",
+  "includeDependencies" : false
+}
diff --git a/index.html b/index.html
index d9d220f4..441dc8db 100644
--- a/index.html
+++ b/index.html
@@ -11,9 +11,9 @@
 	<script src="docs/js/jquery-1.2.6.min.js"></script>
 
 	<!-- Pick a theme, load the plugin & initialize plugin -->
-	<link href="css/theme.default.css" rel="stylesheet">
-	<script src="js/jquery.tablesorter.min.js"></script>
-	<script src="js/jquery.tablesorter.widgets.min.js"></script>
+	<link href="dist/css/theme.default.min.css" rel="stylesheet">
+	<script src="dist/js/jquery.tablesorter.min.js"></script>
+	<script src="dist/js/jquery.tablesorter.widgets.min.js"></script>
 	<script>
 	$(function(){
 		$('table').tablesorter({
diff --git a/js/jquery.metadata.js b/js/extras/jquery.metadata.js
similarity index 99%
rename from js/jquery.metadata.js
rename to js/extras/jquery.metadata.js
index 07b10bae..ddff5e86 100644
--- a/js/jquery.metadata.js
+++ b/js/extras/jquery.metadata.js
@@ -92,6 +92,7 @@ $.extend({
 
 			if ( data.indexOf( '{' ) <0 ) { data = "{" + data + "}"; }
 
+			/*jshint evil:true */
 			data = eval("(" + data + ")");
 
 			$.data( elem, settings.single, data );
diff --git a/js/extras/jquery.quicksearch.js b/js/extras/jquery.quicksearch.js
index ee783ace..f1e311c3 100644
--- a/js/extras/jquery.quicksearch.js
+++ b/js/extras/jquery.quicksearch.js
@@ -32,7 +32,7 @@
 			prepareQuery: function (val) {
 				return val.toLowerCase().split(' ');
 			},
-			testQuery: function (query, txt, _row) {
+			testQuery: function (query, txt) {
 				for (var i = 0; i < query.length; i += 1) {
 					if (txt.indexOf(query[i]) === -1) {
 						return false;
@@ -44,13 +44,13 @@
 
 		this.go = function () {
 
-			var i = 0,
+			var len, i = 0,
 			numMatchedRows = 0,
 			noresults = true,
 			query = options.prepareQuery(val),
 			val_empty = (val.replace(' ', '').length === 0);
 
-			for (var i = 0, len = rowcache.length; i < len; i++) {
+			for (i = 0, len = rowcache.length; i < len; i++) {
 				if (val_empty || options.testQuery(query, cache[i], rowcache[i]) ||
 					($(rowcache[i]).hasClass(options.childRow) && $(rowcache[i > 1 ? i - 1 : 0]).is(':visible'))) {
 					options.show.apply(rowcache[i]);
@@ -125,7 +125,11 @@
 
 		this.loader = function (bool) {
 			if (typeof options.loader === "string" && options.loader !== "") {
-				(bool) ? $(options.loader).show() : $(options.loader).hide();
+				if (bool) {
+					$(options.loader).show();
+				} else {
+					$(options.loader).hide();
+				}
 			}
 			return this;
 		};
diff --git a/js/jquery.tablesorter.js b/js/jquery.tablesorter.js
index 144e725d..1a0fea3d 100644
--- a/js/jquery.tablesorter.js
+++ b/js/jquery.tablesorter.js
@@ -1,8 +1,10 @@
-/**!
-* TableSorter (FORK) 2.19.1 - Client-side table sorting with ease!
+/*! TableSorter (FORK) v2.19.1 *//*
+* Client-side table sorting with ease!
 * @requires jQuery v1.2.6+
 *
 * Copyright (c) 2007 Christian Bach
+* fork maintained by Rob Garrison
+*
 * Examples and docs at: http://tablesorter.com
 * Dual licensed under the MIT and GPL licenses:
 * http://www.opensource.org/licenses/mit-license.php
diff --git a/js/jquery.tablesorter.min.js b/js/jquery.tablesorter.min.js
deleted file mode 100644
index 43cfdb3d..00000000
--- a/js/jquery.tablesorter.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
-* TableSorter (FORK) 2.19.1 min - Client-side table sorting with ease!
-* Copyright (c) 2007 Christian Bach; fork maintained by Rob Garrison
-*/
-(function(h){"function"===typeof define&&define.amd?define(["jquery"],h):"object"===typeof module&&"object"===typeof module.exports?module.exports=h(require("jquery")):h(jQuery)})(function(h){h.extend({tablesorter:new function(){function e(){var b=arguments[0],a=1<arguments.length?Array.prototype.slice.call(arguments):b;if("undefined"!==typeof console&&"undefined"!==typeof console.log)console[/error/i.test(b)?"error":/warn/i.test(b)?"warn":"log"](a);else alert(a)}function w(b,a){e(b+" ("+((new Date).getTime()- a.getTime())+"ms)")}function n(b){for(var a in b)return!1;return!0}function v(b,a,d){if(!a)return"";var c,f=h(a),m=b.config,t=m.textExtraction||"";return"string"===typeof t?h.trim(("basic"===t?f.attr(m.textAttribute)||a.textContent:a.textContent)||f.text()||""):"function"===typeof t?h.trim(t(a,b,d)):"function"===typeof(c=g.getColumnData(b,t,d))?h.trim(c(a,b,d)):h.trim(a.textContent||f.text()||"")}function p(b){var a,d,c=b.config,f=c.$tbodies=c.$table.children("tbody:not(."+c.cssInfoBlock+")"),m,t, k,l,x,q,u,r,n,E=0,B="",z=f.length;if(0===z)return c.debug?e("Warning: *Empty table!* Not building a parser cache"):"";c.debug&&(n=new Date,e("Detecting parsers for each column"));a=[];for(d=[];E<z;){m=f[E].rows;if(m.length)for(t=c.columns,k=0;k<t;k++){l=c.$headers.filter('[data-column="'+k+'"]:last');x=g.getColumnData(b,c.headers,k);r=g.getParserById(g.getData(l,x,"extractor"));u=g.getParserById(g.getData(l,x,"sorter"));q="false"===g.getData(l,x,"parser");c.empties[k]=(g.getData(l,x,"empty")||c.emptyTo|| (c.emptyToBottom?"bottom":"top")).toLowerCase();c.strings[k]=(g.getData(l,x,"string")||c.stringTo||"max").toLowerCase();q&&(u=g.getParserById("no-parser"));r||(r=!1);if(!u)a:{l=b;x=m;q=-1;u=k;for(var C=void 0,M=void 0,N=g.parsers.length,A=!1,y="",C=!0;""===y&&C;)q++,x[q]?(A=x[q].cells[u],y=v(l,A,u),M=h(A),l.config.debug&&e("Checking if value was empty on row "+q+", column: "+u+': "'+y+'"')):C=!1;for(;0<=--N;)if((C=g.parsers[N])&&"text"!==C.id&&C.is&&C.is(y,l,A,M)){u=C;break a}u=g.getParserById("text")}c.debug&& (B+="column:"+k+"; extractor:"+r.id+"; parser:"+u.id+"; string:"+c.strings[k]+"; empty: "+c.empties[k]+"\n");d[k]=u;a[k]=r}E+=d.length?z:1}c.debug&&(e(B?B:"No parsers detected"),w("Completed detecting parsers",n));c.parsers=d;c.extractors=a}function z(b){var a,d,c,f,m,t,k,l,x,q,u,r=b.config,n=r.$table.children("tbody"),p=r.extractors,B=r.parsers;r.cache={};r.totalRows=0;if(!B)return r.debug?e("Warning: *Empty table!* Not building a cache"):"";r.debug&&(l=new Date);r.showProcessing&&g.isProcessing(b, !0);for(m=0;m<n.length;m++)if(u=[],a=r.cache[m]={normalized:[]},!n.eq(m).hasClass(r.cssInfoBlock)){x=n[m]&&n[m].rows.length||0;for(c=0;c<x;++c)if(q={child:[],raw:[]},t=h(n[m].rows[c]),k=[],t.hasClass(r.cssChildRow)&&0!==c)d=a.normalized.length-1,a.normalized[d][r.columns].$row=a.normalized[d][r.columns].$row.add(t),t.prev().hasClass(r.cssChildRow)||t.prev().addClass(g.css.cssHasChild),q.child[d]=h.trim(t[0].textContent||t.text()||"");else{q.$row=t;q.order=c;for(f=0;f<r.columns;++f)"undefined"===typeof B[f]? r.debug&&e("No parser found for cell:",t[0].cells[f],"does it have a header?"):(d=v(b,t[0].cells[f],f),q.raw.push(d),d="undefined"===typeof p[f].id?d:p[f].format(d,b,t[0].cells[f],f),d="no-parser"===B[f].id?"":B[f].format(d,b,t[0].cells[f],f),k.push(r.ignoreCase&&"string"===typeof d?d.toLowerCase():d),"numeric"===(B[f].type||"").toLowerCase()&&(u[f]=Math.max(Math.abs(d)||0,u[f]||0)));k[r.columns]=q;a.normalized.push(k)}a.colMax=u;r.totalRows+=a.normalized.length}r.showProcessing&&g.isProcessing(b); r.debug&&w("Building cache for "+x+" rows",l)}function y(b,a){var d=b.config,c=d.widgetOptions,f=b.tBodies,m=[],t=d.cache,k,l,e,q,u,r;if(n(t))return d.appender?d.appender(b,m):b.isUpdating?d.$table.trigger("updateComplete",b):"";d.debug&&(r=new Date);for(u=0;u<f.length;u++)if(k=h(f[u]),k.length&&!k.hasClass(d.cssInfoBlock)){e=g.processTbody(b,k,!0);k=t[u].normalized;l=k.length;for(q=0;q<l;q++)m.push(k[q][d.columns].$row),d.appender&&(!d.pager||d.pager.removeRows&&c.pager_removeRows||d.pager.ajax)|| e.append(k[q][d.columns].$row);g.processTbody(b,e,!1)}d.appender&&d.appender(b,m);d.debug&&w("Rebuilt table",r);a||d.appender||g.applyWidget(b);b.isUpdating&&d.$table.trigger("updateComplete",b)}function F(b){return/^d/i.test(b)||1===b}function D(b){var a,d,c,f,m,t,k,l=b.config;l.headerList=[];l.headerContent=[];l.debug&&(k=new Date);l.columns=g.computeColumnIndex(l.$table.children("thead, tfoot").children("tr"));f=l.cssIcon?'<i class="'+(l.cssIcon===g.css.icon?g.css.icon:l.cssIcon+" "+g.css.icon)+ '"></i>':"";l.$headers=h(h.map(h(b).find(l.selectorHeaders),function(k,e){d=h(k);if(!d.parent().hasClass(l.cssIgnoreRow))return a=g.getColumnData(b,l.headers,e,!0),l.headerContent[e]=d.html(),""===l.headerTemplate||d.find("."+g.css.headerIn).length||(m=l.headerTemplate.replace(/\{content\}/g,d.html()).replace(/\{icon\}/g,d.find("."+g.css.icon).length?"":f),l.onRenderTemplate&&(c=l.onRenderTemplate.apply(d,[e,m]))&&"string"===typeof c&&(m=c),d.html('<div class="'+g.css.headerIn+'">'+m+"</div>")),l.onRenderHeader&& l.onRenderHeader.apply(d,[e,l,l.$table]),k.column=parseInt(d.attr("data-column"),10),k.order=F(g.getData(d,a,"sortInitialOrder")||l.sortInitialOrder)?[1,0,2]:[0,1,2],k.count=-1,k.lockedOrder=!1,t=g.getData(d,a,"lockedOrder")||!1,"undefined"!==typeof t&&!1!==t&&(k.order=k.lockedOrder=F(t)?[1,1,1]:[0,0,0]),d.addClass(g.css.header+" "+l.cssHeader),l.headerList[e]=k,d.parent().addClass(g.css.headerRow+" "+l.cssHeaderRow).attr("role","row"),l.tabIndex&&d.attr("tabindex",0),k}));h(b).find(l.selectorHeaders).attr({scope:"col", role:"columnheader"});H(b);l.debug&&(w("Built headers:",k),e(l.$headers))}function I(b,a,d){var c=b.config;c.$table.find(c.selectorRemove).remove();p(b);z(b);J(c,a,d)}function H(b){var a,d,c,f=b.config;f.$headers.each(function(m,t){d=h(t);c=g.getColumnData(b,f.headers,m,!0);a="false"===g.getData(t,c,"sorter")||"false"===g.getData(t,c,"parser");t.sortDisabled=a;d[a?"addClass":"removeClass"]("sorter-false").attr("aria-disabled",""+a);b.id&&(a?d.removeAttr("aria-controls"):d.attr("aria-controls",b.id))})} function G(b){var a,d,c=b.config,f=c.sortList,m=f.length,t=g.css.sortNone+" "+c.cssNone,k=[g.css.sortAsc+" "+c.cssAsc,g.css.sortDesc+" "+c.cssDesc],e=[c.cssIconAsc,c.cssIconDesc,c.cssIconNone],n=["ascending","descending"],q=h(b).find("tfoot tr").children().add(c.$extraHeaders).removeClass(k.join(" "));c.$headers.removeClass(k.join(" ")).addClass(t).attr("aria-sort","none").find("."+c.cssIcon).removeClass(e.join(" ")).addClass(e[2]);for(a=0;a<m;a++)if(2!==f[a][1]&&(b=c.$headers.not(".sorter-false").filter('[data-column="'+ f[a][0]+'"]'+(1===m?":last":"")),b.length)){for(d=0;d<b.length;d++)b[d].sortDisabled||b.eq(d).removeClass(t).addClass(k[f[a][1]]).attr("aria-sort",n[f[a][1]]).find("."+c.cssIcon).removeClass(e[2]).addClass(e[f[a][1]]);q.length&&q.filter('[data-column="'+f[a][0]+'"]').removeClass(t).addClass(k[f[a][1]])}c.$headers.not(".sorter-false").each(function(){var b=h(this),a=this.order[(this.count+1)%(c.sortReset?3:2)],a=h.trim(b.text())+": "+g.language[b.hasClass(g.css.sortAsc)?"sortAsc":b.hasClass(g.css.sortDesc)? "sortDesc":"sortNone"]+g.language[0===a?"nextAsc":1===a?"nextDesc":"nextNone"];b.attr("aria-label",a)})}function Q(b,a){var d,c,f,m,g,k=b.config,e=a||k.sortList;k.sortList=[];h.each(e,function(b,a){m=parseInt(a[0],10);if(f=k.$headers.filter('[data-column="'+m+'"]:last')[0]){c=(c=(""+a[1]).match(/^(1|d|s|o|n)/))?c[0]:"";switch(c){case "1":case "d":c=1;break;case "s":c=g||0;break;case "o":d=f.order[(g||0)%(k.sortReset?3:2)];c=0===d?1:1===d?0:2;break;case "n":f.count+=1;c=f.order[f.count%(k.sortReset? 3:2)];break;default:c=0}g=0===b?c:g;d=[m,parseInt(c,10)||0];k.sortList.push(d);c=h.inArray(d[1],f.order);f.count=0<=c?c:d[1]%(k.sortReset?3:2)}})}function R(b,a){return b&&b[a]?b[a].type||"":""}function O(b,a,d){if(b.isUpdating)return setTimeout(function(){O(b,a,d)},50);var c,f,m,e,k=b.config,l=!d[k.sortMultiSortKey],n=k.$table;n.trigger("sortStart",b);a.count=d[k.sortResetKey]?2:(a.count+1)%(k.sortReset?3:2);k.sortRestart&&(f=a,k.$headers.each(function(){this===f||!l&&h(this).is("."+g.css.sortDesc+ ",."+g.css.sortAsc)||(this.count=-1)}));f=parseInt(h(a).attr("data-column"),10);if(l){k.sortList=[];if(null!==k.sortForce)for(c=k.sortForce,m=0;m<c.length;m++)c[m][0]!==f&&k.sortList.push(c[m]);c=a.order[a.count];if(2>c&&(k.sortList.push([f,c]),1<a.colSpan))for(m=1;m<a.colSpan;m++)k.sortList.push([f+m,c])}else{if(k.sortAppend&&1<k.sortList.length)for(m=0;m<k.sortAppend.length;m++)e=g.isValueInArray(k.sortAppend[m][0],k.sortList),0<=e&&k.sortList.splice(e,1);if(0<=g.isValueInArray(f,k.sortList))for(m= 0;m<k.sortList.length;m++)e=k.sortList[m],c=k.$headers.filter('[data-column="'+e[0]+'"]:last')[0],e[0]===f&&(e[1]=c.order[a.count],2===e[1]&&(k.sortList.splice(m,1),c.count=-1));else if(c=a.order[a.count],2>c&&(k.sortList.push([f,c]),1<a.colSpan))for(m=1;m<a.colSpan;m++)k.sortList.push([f+m,c])}if(null!==k.sortAppend)for(c=k.sortAppend,m=0;m<c.length;m++)c[m][0]!==f&&k.sortList.push(c[m]);n.trigger("sortBegin",b);setTimeout(function(){G(b);K(b);y(b);n.trigger("sortEnd",b)},1)}function K(b){var a, d,c,f,m,e,k,h,x,q,u,r=0,p=b.config,v=p.textSorter||"",B=p.sortList,A=B.length,z=b.tBodies.length;if(!p.serverSideSorting&&!n(p.cache)){p.debug&&(m=new Date);for(d=0;d<z;d++)e=p.cache[d].colMax,k=p.cache[d].normalized,k.sort(function(d,m){for(a=0;a<A;a++){f=B[a][0];h=B[a][1];r=0===h;if(p.sortStable&&d[f]===m[f]&&1===A)break;(c=/n/i.test(R(p.parsers,f)))&&p.strings[f]?(c="boolean"===typeof p.string[p.strings[f]]?(r?1:-1)*(p.string[p.strings[f]]?-1:1):p.strings[f]?p.string[p.strings[f]]||0:0,x=p.numberSorter? p.numberSorter(d[f],m[f],r,e[f],b):g["sortNumeric"+(r?"Asc":"Desc")](d[f],m[f],c,e[f],f,b)):(q=r?d:m,u=r?m:d,x="function"===typeof v?v(q[f],u[f],r,f,b):"object"===typeof v&&v.hasOwnProperty(f)?v[f](q[f],u[f],r,f,b):g["sortNatural"+(r?"Asc":"Desc")](d[f],m[f],f,b,p));if(x)return x}return d[p.columns].order-m[p.columns].order});p.debug&&w("Sorting on "+B.toString()+" and dir "+h+" time",m)}}function L(b,a){b.table.isUpdating&&b.$table.trigger("updateComplete",b.table);h.isFunction(a)&&a(b.table)}function J(b, a,d){var c=h.isArray(a)?a:b.sortList;!1===("undefined"===typeof a?b.resort:a)||b.serverSideSorting||b.table.isProcessing?(L(b,d),g.applyWidget(b.table,!1)):c.length?b.$table.trigger("sorton",[c,function(){L(b,d)},!0]):b.$table.trigger("sortReset",[function(){L(b,d);g.applyWidget(b.table,!1)}])}function P(b){var a=b.config,d=a.$table,c="sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache "+"updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(a.namespace+ " ");d.unbind(h.trim(c)).bind("sortReset"+a.namespace,function(f,d){f.stopPropagation();a.sortList=[];G(b);K(b);y(b);h.isFunction(d)&&d(b)}).bind("updateAll"+a.namespace,function(f,d,c){f.stopPropagation();b.isUpdating=!0;g.refreshWidgets(b,!0,!0);D(b);g.bindEvents(b,a.$headers,!0);P(b);I(b,d,c)}).bind("update"+a.namespace+" updateRows"+a.namespace,function(a,d,c){a.stopPropagation();b.isUpdating=!0;H(b);I(b,d,c)}).bind("updateCell"+a.namespace,function(f,c,g,e){f.stopPropagation();b.isUpdating=!0; d.find(a.selectorRemove).remove();var l,n,q;n=d.find("tbody");q=h(c);f=n.index(h.fn.closest?q.closest("tbody"):q.parents("tbody").filter(":first"));l=h.fn.closest?q.closest("tr"):q.parents("tr").filter(":first");c=q[0];n.length&&0<=f&&(n=n.eq(f).find("tr").index(l),q=q.index(),a.cache[f].normalized[n][a.columns].$row=l,l="undefined"===typeof a.extractors[q].id?v(b,c,q):a.extractors[q].format(v(b,c,q),b,c,q),c="no-parser"===a.parsers[q].id?"":a.parsers[q].format(l,b,c,q),a.cache[f].normalized[n][q]= a.ignoreCase&&"string"===typeof c?c.toLowerCase():c,"numeric"===(a.parsers[q].type||"").toLowerCase()&&(a.cache[f].colMax[q]=Math.max(Math.abs(c)||0,a.cache[f].colMax[q]||0)),c="undefined"!==g?g:a.resort,!1!==c?J(a,c,e):(h.isFunction(e)&&e(b),a.$table.trigger("updateComplete",a.table)))}).bind("addRows"+a.namespace,function(c,m,g,e){c.stopPropagation();b.isUpdating=!0;if(n(a.cache))H(b),I(b,g,e);else{m=h(m).attr("role","row");var l,w,q,u,r,z=m.filter("tr").length,y=d.find("tbody").index(m.parents("tbody").filter(":first")); a.parsers&&a.parsers.length||p(b);for(c=0;c<z;c++){w=m[c].cells.length;r=[];u={child:[],$row:m.eq(c),order:a.cache[y].normalized.length};for(l=0;l<w;l++)q="undefined"===typeof a.extractors[l].id?v(b,m[c].cells[l],l):a.extractors[l].format(v(b,m[c].cells[l],l),b,m[c].cells[l],l),q="no-parser"===a.parsers[l].id?"":a.parsers[l].format(q,b,m[c].cells[l],l),r[l]=a.ignoreCase&&"string"===typeof q?q.toLowerCase():q,"numeric"===(a.parsers[l].type||"").toLowerCase()&&(a.cache[y].colMax[l]=Math.max(Math.abs(r[l])|| 0,a.cache[y].colMax[l]||0));r.push(u);a.cache[y].normalized.push(r)}J(a,g,e)}}).bind("updateComplete"+a.namespace,function(){b.isUpdating=!1}).bind("sorton"+a.namespace,function(a,c,e,k){var l=b.config;a.stopPropagation();d.trigger("sortStart",this);Q(b,c);G(b);l.delayInit&&n(l.cache)&&z(b);d.trigger("sortBegin",this);K(b);y(b,k);d.trigger("sortEnd",this);g.applyWidget(b);h.isFunction(e)&&e(b)}).bind("appendCache"+a.namespace,function(a,c,d){a.stopPropagation();y(b,d);h.isFunction(c)&&c(b)}).bind("updateCache"+ a.namespace,function(c,d){a.parsers&&a.parsers.length||p(b);z(b);h.isFunction(d)&&d(b)}).bind("applyWidgetId"+a.namespace,function(c,d){c.stopPropagation();g.getWidgetById(d).format(b,a,a.widgetOptions)}).bind("applyWidgets"+a.namespace,function(a,c){a.stopPropagation();g.applyWidget(b,c)}).bind("refreshWidgets"+a.namespace,function(a,c,d){a.stopPropagation();g.refreshWidgets(b,c,d)}).bind("destroy"+a.namespace,function(a,c,d){a.stopPropagation();g.destroy(b,c,d)}).bind("resetToLoadState"+a.namespace, function(){g.removeWidget(b,!0,!1);a=h.extend(!0,g.defaults,a.originalSettings);b.hasInitialized=!1;g.setup(b,a)})}var g=this;g.version="2.19.1";g.parsers=[];g.widgets=[];g.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,resort:!0,headers:{},ignoreCase:!0,sortForce:null, sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,widgetClass:"widget-{name}",initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow",cssIcon:"tablesorter-icon",cssIconNone:"", cssIconAsc:"",cssIconDesc:"",cssInfoBlock:"tablesorter-infoOnly",cssAllowClicks:"tablesorter-allowClicks",cssIgnoreRow:"tablesorter-ignoreRow",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]};g.css={table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",colgroup:"tablesorter-colgroup",header:"tablesorter-header",headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner", icon:"tablesorter-icon",info:"tablesorter-infoOnly",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc",sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"};g.language={sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"};g.log=e;g.benchmark=w;g.construct=function(b){return this.each(function(){var a= h.extend(!0,{},g.defaults,b);a.originalSettings=b;!this.hasInitialized&&g.buildTable&&"TABLE"!==this.tagName?g.buildTable(this,a):g.setup(this,a)})};g.setup=function(b,a){if(!b||!b.tHead||0===b.tBodies.length||!0===b.hasInitialized)return a.debug?e("ERROR: stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var d="",c=h(b),f=h.metadata;b.hasInitialized=!1;b.isProcessing=!0;b.config=a;h.data(b,"tablesorter",a);a.debug&&h.data(b,"startoveralltimer",new Date); a.supportsDataObject=function(a){a[0]=parseInt(a[0],10);return 1<a[0]||1===a[0]&&4<=parseInt(a[1],10)}(h.fn.jquery.split("."));a.string={max:1,min:-1,emptymin:1,emptymax:-1,zero:0,none:0,"null":0,top:!0,bottom:!1};a.emptyTo=a.emptyTo.toLowerCase();a.stringTo=a.stringTo.toLowerCase();/tablesorter\-/.test(c.attr("class"))||(d=""!==a.theme?" tablesorter-"+a.theme:"");a.table=b;a.$table=c.addClass(g.css.table+" "+a.tableClass+d).attr("role","grid");a.$headers=c.find(a.selectorHeaders);a.namespace=a.namespace? "."+a.namespace.replace(/\W/g,""):".tablesorter"+Math.random().toString(16).slice(2);a.$table.children().children("tr").attr("role","row");a.$tbodies=c.children("tbody:not(."+a.cssInfoBlock+")").attr({"aria-live":"polite","aria-relevant":"all"});a.$table.children("caption").length&&(d=a.$table.children("caption")[0],d.id||(d.id=a.namespace.slice(1)+"caption"),a.$table.attr("aria-labelledby",d.id));a.widgetInit={};a.textExtraction=a.$table.attr("data-text-extraction")||a.textExtraction||"basic";D(b); g.fixColumnWidth(b);p(b);a.totalRows=0;a.delayInit||z(b);g.bindEvents(b,a.$headers,!0);P(b);a.supportsDataObject&&"undefined"!==typeof c.data().sortlist?a.sortList=c.data().sortlist:f&&c.metadata()&&c.metadata().sortlist&&(a.sortList=c.metadata().sortlist);g.applyWidget(b,!0);0<a.sortList.length?c.trigger("sorton",[a.sortList,{},!a.initWidgets,!0]):(G(b),a.initWidgets&&g.applyWidget(b,!1));a.showProcessing&&c.unbind("sortBegin"+a.namespace+" sortEnd"+a.namespace).bind("sortBegin"+a.namespace+" sortEnd"+ a.namespace,function(c){clearTimeout(a.processTimer);g.isProcessing(b);"sortBegin"===c.type&&(a.processTimer=setTimeout(function(){g.isProcessing(b,!0)},500))});b.hasInitialized=!0;b.isProcessing=!1;a.debug&&g.benchmark("Overall initialization time",h.data(b,"startoveralltimer"));c.trigger("tablesorter-initialized",b);"function"===typeof a.initialized&&a.initialized(b)};g.fixColumnWidth=function(b){b=h(b)[0];var a,d,c=b.config,f=c.$table.children("colgroup");f.length&&f.hasClass(g.css.colgroup)&& f.remove();c.widthFixed&&0===c.$table.children("colgroup").length&&(f=h('<colgroup class="'+g.css.colgroup+'">'),a=c.$table.width(),h(b.tBodies).not("."+c.cssInfoBlock).find("tr:first").children(":visible").each(function(){d=parseInt(h(this).width()/a*1E3,10)/10+"%";f.append(h("<col>").css("width",d))}),c.$table.prepend(f))};g.getColumnData=function(b,a,d,c,f){if("undefined"!==typeof a&&null!==a){b=h(b)[0];var g;b=b.config;f=f||b.$headers;if(a[d])return c?a[d]:a[f.index(f.filter('[data-column="'+ d+'"]:last'))];for(g in a)if("string"===typeof g&&(c=f.filter('[data-column="'+d+'"]:last').filter(g).add(f.filter('[data-column="'+d+'"]:last').find(g)),c.length))return a[g]}};g.computeColumnIndex=function(b){var a=[],d=0,c,f,g,e,k,l,n,q,u,p;for(c=0;c<b.length;c++)for(k=b[c].cells,f=0;f<k.length;f++){g=k[f];e=h(g);l=g.parentNode.rowIndex;e.index();n=g.rowSpan||1;q=g.colSpan||1;"undefined"===typeof a[l]&&(a[l]=[]);for(g=0;g<a[l].length+1;g++)if("undefined"===typeof a[l][g]){u=g;break}d=Math.max(u, d);e.attr({"data-column":u});for(g=l;g<l+n;g++)for("undefined"===typeof a[g]&&(a[g]=[]),p=a[g],e=u;e<u+q;e++)p[e]="x"}return d+1};g.isProcessing=function(b,a,d){b=h(b);var c=b[0].config,f=d||b.find("."+g.css.header);a?("undefined"!==typeof d&&0<c.sortList.length&&(f=f.filter(function(){return this.sortDisabled?!1:0<=g.isValueInArray(parseFloat(h(this).attr("data-column")),c.sortList)})),b.add(f).addClass(g.css.processing+" "+c.cssProcessing)):b.add(f).removeClass(g.css.processing+" "+c.cssProcessing)}; g.processTbody=function(b,a,d){b=h(b)[0];if(d)return b.isProcessing=!0,a.before('<span class="tablesorter-savemyplace"/>'),d=h.fn.detach?a.detach():a.remove();d=h(b).find("span.tablesorter-savemyplace");a.insertAfter(d);d.remove();b.isProcessing=!1};g.clearTableBody=function(b){h(b)[0].config.$tbodies.children().detach()};g.bindEvents=function(b,a,d){b=h(b)[0];var c,f=b.config;!0!==d&&(f.$extraHeaders=f.$extraHeaders?f.$extraHeaders.add(a):a);a.find(f.selectorSort).add(a.filter(f.selectorSort)).unbind(h.trim(["mousedown", "mouseup","sort","keyup",""].join(f.namespace+" "))).bind(h.trim(["mousedown","mouseup","sort","keyup",""].join(f.namespace+" ")),function(d,g){var e;e=d.type;if(!(1!==(d.which||d.button)&&!/sort|keyup/.test(e)||"keyup"===e&&13!==d.which||"mouseup"===e&&!0!==g&&250<(new Date).getTime()-c)){if("mousedown"===e)return c=(new Date).getTime(),/(input|select|button|textarea)/i.test(d.target.tagName)||h(d.target).closest("td,th").hasClass(f.cssAllowClicks)?"":!f.cancelSelection;f.delayInit&&n(f.cache)&& z(b);e=h.fn.closest?h(this).closest("th, td")[0]:/TH|TD/.test(this.tagName)?this:h(this).parents("th, td")[0];e=f.$headers[a.index(e)];e.sortDisabled||O(b,e,d)}});f.cancelSelection&&a.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none",MozUserSelect:"none"})};g.restoreHeaders=function(b){var a,d=h(b)[0].config;d.$table.find(d.selectorHeaders).each(function(b){a=h(this);a.find("."+g.css.headerIn).length&&a.html(d.headerContent[b])})};g.destroy=function(b,a,d){b=h(b)[0];if(b.hasInitialized){g.removeWidget(b, !0,!1);var c,f=h(b),e=b.config;c=f.find("thead:first");var n=c.find("tr."+g.css.headerRow).removeClass(g.css.headerRow+" "+e.cssHeaderRow),k=f.find("tfoot:first > tr").children("th, td");!1===a&&0<=h.inArray("uitheme",e.widgets)&&(f.trigger("applyWidgetId",["uitheme"]),f.trigger("applyWidgetId",["zebra"]));c.find("tr").not(n).remove();c="sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache "+"applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd resetToLoadState ".split(" ").join(e.namespace+ " ");f.removeData("tablesorter").unbind(h.trim(c));e.$headers.add(k).removeClass([g.css.header,e.cssHeader,e.cssAsc,e.cssDesc,g.css.sortAsc,g.css.sortDesc,g.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled","true");n.find(e.selectorSort).unbind(h.trim(["mousedown","mouseup","keypress",""].join(e.namespace+" ")));g.restoreHeaders(b);f.toggleClass(g.css.table+" "+e.tableClass+" tablesorter-"+e.theme,!1===a);b.hasInitialized=!1;delete b.config.cache;"function"=== typeof d&&d(b)}};g.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i};g.sortNatural=function(b,a){if(b===a)return 0;var d,c,f,e,h,k;c=g.regex;if(c.hex.test(a)){d=parseInt(b.match(c.hex),16);f=parseInt(a.match(c.hex),16);if(d<f)return-1;if(d>f)return 1}d=b.replace(c.chunk,"\\0$1\\0").replace(c.chunks,"").split("\\0");c=a.replace(c.chunk,"\\0$1\\0").replace(c.chunks,"").split("\\0");k=Math.max(d.length,c.length);for(h= 0;h<k;h++){f=isNaN(d[h])?d[h]||0:parseFloat(d[h])||0;e=isNaN(c[h])?c[h]||0:parseFloat(c[h])||0;if(isNaN(f)!==isNaN(e))return isNaN(f)?1:-1;typeof f!==typeof e&&(f+="",e+="");if(f<e)return-1;if(f>e)return 1}return 0};g.sortNaturalAsc=function(b,a,d,c,f){if(b===a)return 0;d=f.string[f.empties[d]||f.emptyTo];return""===b&&0!==d?"boolean"===typeof d?d?-1:1:-d||-1:""===a&&0!==d?"boolean"===typeof d?d?1:-1:d||1:g.sortNatural(b,a)};g.sortNaturalDesc=function(b,a,d,c,f){if(b===a)return 0;d=f.string[f.empties[d]|| f.emptyTo];return""===b&&0!==d?"boolean"===typeof d?d?-1:1:d||1:""===a&&0!==d?"boolean"===typeof d?d?1:-1:-d||-1:g.sortNatural(a,b)};g.sortText=function(b,a){return b>a?1:b<a?-1:0};g.getTextValue=function(b,a,d){if(d){var c=b?b.length:0,f=d+a;for(d=0;d<c;d++)f+=b.charCodeAt(d);return a*f}return 0};g.sortNumericAsc=function(b,a,d,c,f,e){if(b===a)return 0;e=e.config;f=e.string[e.empties[f]||e.emptyTo];if(""===b&&0!==f)return"boolean"===typeof f?f?-1:1:-f||-1;if(""===a&&0!==f)return"boolean"===typeof f? f?1:-1:f||1;isNaN(b)&&(b=g.getTextValue(b,d,c));isNaN(a)&&(a=g.getTextValue(a,d,c));return b-a};g.sortNumericDesc=function(b,a,d,c,f,e){if(b===a)return 0;e=e.config;f=e.string[e.empties[f]||e.emptyTo];if(""===b&&0!==f)return"boolean"===typeof f?f?-1:1:f||1;if(""===a&&0!==f)return"boolean"===typeof f?f?1:-1:-f||-1;isNaN(b)&&(b=g.getTextValue(b,d,c));isNaN(a)&&(a=g.getTextValue(a,d,c));return a-b};g.sortNumeric=function(b,a){return b-a};g.characterEquivalents={a:"\u00e1\u00e0\u00e2\u00e3\u00e4\u0105\u00e5", A:"\u00c1\u00c0\u00c2\u00c3\u00c4\u0104\u00c5",c:"\u00e7\u0107\u010d",C:"\u00c7\u0106\u010c",e:"\u00e9\u00e8\u00ea\u00eb\u011b\u0119",E:"\u00c9\u00c8\u00ca\u00cb\u011a\u0118",i:"\u00ed\u00ec\u0130\u00ee\u00ef\u0131",I:"\u00cd\u00cc\u0130\u00ce\u00cf",o:"\u00f3\u00f2\u00f4\u00f5\u00f6",O:"\u00d3\u00d2\u00d4\u00d5\u00d6",ss:"\u00df",SS:"\u1e9e",u:"\u00fa\u00f9\u00fb\u00fc\u016f",U:"\u00da\u00d9\u00db\u00dc\u016e"};g.replaceAccents=function(b){var a,d="[",c=g.characterEquivalents;if(!g.characterRegex){g.characterRegexArray= {};for(a in c)"string"===typeof a&&(d+=c[a],g.characterRegexArray[a]=new RegExp("["+c[a]+"]","g"));g.characterRegex=new RegExp(d+"]")}if(g.characterRegex.test(b))for(a in c)"string"===typeof a&&(b=b.replace(g.characterRegexArray[a],a));return b};g.isValueInArray=function(b,a){var d,c=a.length;for(d=0;d<c;d++)if(a[d][0]===b)return d;return-1};g.addParser=function(b){var a,d=g.parsers.length,c=!0;for(a=0;a<d;a++)g.parsers[a].id.toLowerCase()===b.id.toLowerCase()&&(c=!1);c&&g.parsers.push(b)};g.getParserById= function(b){if("false"==b)return!1;var a,d=g.parsers.length;for(a=0;a<d;a++)if(g.parsers[a].id.toLowerCase()===b.toString().toLowerCase())return g.parsers[a];return!1};g.addWidget=function(b){g.widgets.push(b)};g.hasWidget=function(b,a){b=h(b);return b.length&&b[0].config&&b[0].config.widgetInit[a]||!1};g.getWidgetById=function(b){var a,d,c=g.widgets.length;for(a=0;a<c;a++)if((d=g.widgets[a])&&d.hasOwnProperty("id")&&d.id.toLowerCase()===b.toLowerCase())return d};g.applyWidget=function(b,a,d){b=h(b)[0]; var c=b.config,f=c.widgetOptions,e=" "+c.table.className+" ",n=[],k,l,p;!1!==a&&b.hasInitialized&&(b.isApplyingWidgets||b.isUpdating)||(c.debug&&(k=new Date),p=new RegExp("\\s"+c.widgetClass.replace(/\{name\}/i,"([\\w-]+)")+"\\s","g"),e.match(p)&&(e=e.match(p))&&h.each(e,function(a,b){c.widgets.push(b.replace(p,"$1"))}),c.widgets.length&&(b.isApplyingWidgets=!0,c.widgets=h.grep(c.widgets,function(a,b){return h.inArray(a,c.widgets)===b}),h.each(c.widgets||[],function(a,b){(p=g.getWidgetById(b))&&p.id&& (p.priority||(p.priority=10),n[a]=p)}),n.sort(function(a,b){return a.priority<b.priority?-1:a.priority===b.priority?0:1}),h.each(n,function(d,e){if(e){if(a||!c.widgetInit[e.id])c.widgetInit[e.id]=!0,e.hasOwnProperty("options")&&(f=b.config.widgetOptions=h.extend(!0,{},e.options,f)),e.hasOwnProperty("init")&&(c.debug&&(l=new Date),e.init(b,e,c,f),c.debug&&g.benchmark("Initializing "+e.id+" widget",l));!a&&e.hasOwnProperty("format")&&(c.debug&&(l=new Date),e.format(b,c,f,!1),c.debug&&g.benchmark((a? "Initializing ":"Applying ")+e.id+" widget",l))}}),a||"function"!==typeof d||d(b)),setTimeout(function(){b.isApplyingWidgets=!1;h.data(b,"lastWidgetApplication",new Date)},0),c.debug&&(e=c.widgets.length,w("Completed "+(!0===a?"initializing ":"applying ")+e+" widget"+(1!==e?"s":""),k)))};g.removeWidget=function(b,a,d){b=h(b)[0];!0===a?(a=[],h.each(g.widgets,function(b,c){c&&c.id&&a.push(c.id)})):a=(h.isArray(a)?a.join(","):a||"").toLowerCase().split(/[\s,]+/);var c,f,m,n=b.config,k=a.length;for(c= 0;c<k;c++)f=g.getWidgetById(a[c]),m=h.inArray(a[c],n.widgets),f&&"remove"in f&&(n.debug&&0<=m&&e('Removing "'+a[c]+'" widget'),f.remove(b,n,n.widgetOptions,d),n.widgetInit[a[c]]=!1),0<=m&&!0!==d&&n.widgets.splice(m,1)};g.refreshWidgets=function(b,a,d){b=h(b)[0];var c=b.config.widgets,f=[],e=function(a){h(a).trigger("refreshComplete")};h.each(g.widgets,function(b,d){d&&d.id&&(a||0>h.inArray(d.id,c))&&f.push(d.id)});g.removeWidget(b,f.join(","),!0);!0!==d?(g.applyWidget(b,a||!1,e),a&&g.applyWidget(b, !1,e)):e(b)};g.getData=function(b,a,d){var c="";b=h(b);var f,e;if(!b.length)return"";f=h.metadata?b.metadata():!1;e=" "+(b.attr("class")||"");"undefined"!==typeof b.data(d)||"undefined"!==typeof b.data(d.toLowerCase())?c+=b.data(d)||b.data(d.toLowerCase()):f&&"undefined"!==typeof f[d]?c+=f[d]:a&&"undefined"!==typeof a[d]?c+=a[d]:" "!==e&&e.match(" "+d+"-")&&(c=e.match(new RegExp("\\s"+d+"-([\\w-]+)"))[1]||"");return h.trim(c)};g.formatFloat=function(b,a){if("string"!==typeof b||""===b)return b;var d; b=(a&&a.config?!1!==a.config.usNumberFormat:"undefined"!==typeof a?a:1)?b.replace(/,/g,""):b.replace(/[\s|\.]/g,"").replace(/,/g,".");/^\s*\([.\d]+\)/.test(b)&&(b=b.replace(/^\s*\(([.\d]+)\)/,"-$1"));d=parseFloat(b);return isNaN(d)?h.trim(b):d};g.isDigit=function(b){return isNaN(b)?/^[\-+(]?\d+[)]?$/.test(b.toString().replace(/[,.'"\s]/g,"")):!0}}});var p=h.tablesorter;h.fn.extend({tablesorter:p.construct});p.addParser({id:"no-parser",is:function(){return!1},format:function(){return""},type:"text"}); p.addParser({id:"text",is:function(){return!0},format:function(e,w){var n=w.config;e&&(e=h.trim(n.ignoreCase?e.toLocaleLowerCase():e),e=n.sortLocaleCompare?p.replaceAccents(e):e);return e},type:"text"});p.addParser({id:"digit",is:function(e){return p.isDigit(e)},format:function(e,w){var n=p.formatFloat((e||"").replace(/[^\w,. \-()]/g,""),w);return e&&"number"===typeof n?n:e?h.trim(e&&w.config.ignoreCase?e.toLocaleLowerCase():e):e},type:"numeric"});p.addParser({id:"currency",is:function(e){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((e|| "").replace(/[+\-,. ]/g,""))},format:function(e,w){var n=p.formatFloat((e||"").replace(/[^\w,. \-()]/g,""),w);return e&&"number"===typeof n?n:e?h.trim(e&&w.config.ignoreCase?e.toLocaleLowerCase():e):e},type:"numeric"});p.addParser({id:"url",is:function(e){return/^(https?|ftp|file):\/\//.test(e)},format:function(e){return e?h.trim(e.replace(/(https?|ftp|file):\/\//,"")):e},parsed:!0,type:"text"});p.addParser({id:"isoDate",is:function(e){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(e)},format:function(e, h){var n=e?new Date(e.replace(/-/g,"/")):e;return n instanceof Date&&isFinite(n)?n.getTime():e},type:"numeric"});p.addParser({id:"percent",is:function(e){return/(\d\s*?%|%\s*?\d)/.test(e)&&15>e.length},format:function(e,h){return e?p.formatFloat(e.replace(/%/g,""),h):e},type:"numeric"});p.addParser({id:"image",is:function(e,h,n,p){return 0<p.find("img").length},format:function(e,p,n){return h(n).find("img").attr(p.config.imgAttr||"alt")||e},parsed:!0,type:"text"});p.addParser({id:"usLongDate",is:function(e){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(e)|| /^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(e)},format:function(e,h){var n=e?new Date(e.replace(/(\S)([AP]M)$/i,"$1 $2")):e;return n instanceof Date&&isFinite(n)?n.getTime():e},type:"numeric"});p.addParser({id:"shortDate",is:function(e){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((e||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(e,h,n,v){if(e){n=h.config;var A=n.$headers.filter('[data-column="'+v+'"]:last');v=A.length&&A[0].dateFormat||p.getData(A, p.getColumnData(h,n.headers,v),"dateFormat")||n.dateFormat;h=e.replace(/\s+/g," ").replace(/[\-.,]/g,"/");"mmddyyyy"===v?h=h.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===v?h=h.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===v&&(h=h.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3"));h=new Date(h);return h instanceof Date&&isFinite(h)?h.getTime():e}return e},type:"numeric"});p.addParser({id:"time",is:function(e){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(e)}, format:function(e,h){var n=e?new Date("2000/01/01 "+e.replace(/(\S)([AP]M)$/i,"$1 $2")):e;return n instanceof Date&&isFinite(n)?n.getTime():e},type:"numeric"});p.addParser({id:"metadata",is:function(){return!1},format:function(e,p,n){e=p.config;e=e.parserMetadataName?e.parserMetadataName:"sortValue";return h(n).metadata()[e]},type:"numeric"});p.addWidget({id:"zebra",priority:90,format:function(e,p,n){var v,A,z,y,F=new RegExp(p.cssChildRow,"i"),D=p.$tbodies;for(e=0;e<D.length;e++)z=0,v=D.eq(e),v=v.children("tr:visible").not(p.selectorRemove), v.each(function(){A=h(this);F.test(this.className)||z++;y=0===z%2;A.removeClass(n.zebra[y?1:0]).addClass(n.zebra[y?0:1])})},remove:function(e,h,n,v){if(!v){h=h.$tbodies;var A=(n.zebra||["even","odd"]).join(" ");for(n=0;n<h.length;n++)v=p.processTbody(e,h.eq(n),!0),v.children().removeClass(A),p.processTbody(e,v,!1)}}});return p});
diff --git a/js/jquery.tablesorter.widgets-filter-formatter.min.js b/js/jquery.tablesorter.widgets-filter-formatter.min.js
deleted file mode 100644
index e07e5565..00000000
--- a/js/jquery.tablesorter.widgets-filter-formatter.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*! Filter widget formatter functions - updated 6/18/2014 (v2.17.2)
- * requires: tableSorter (FORK) 2.15+ and jQuery 1.4.3+
- * jQuery UI spinner, silder, range slider & datepicker (range)
- * HTML5 number (spinner), range slider & color selector
- */
-;(function(g){var r=g.tablesorter||{},n=r.filterFormatter={addCompare:function(b,f,e){if(e.compare&&g.isArray(e.compare)&&1<e.compare.length){var a="",c=[".compare-select".slice(1)," "+".compare-select".slice(1),""],l=e.cellText?'<label class="'+c.join("-label")+f+'">'+e.cellText+"</label>":"";g.each(e.compare,function(b,c){a+="<option "+(e.selected===b?"selected":"")+">"+c+"</option>"});b.wrapInner('<div class="'+c.join("-wrapper")+f+'" />').prepend(l+'<select class="'+c.join("")+f+'" />').find("select").append(a)}}, updateCompare:function(b,f,e){f=f.val()||"";var a=f.replace(/\s*?[><=]\s*?/g,""),c=f.match(/[><=]/g)||"";e.compare&&(g.isArray(e.compare)&&(c=(c||[]).join("")||e.compare[e.selected||0]),b.find(".compare-select").val(c));return[f,a]},uiSpinner:function(b,f,e){var a=g.extend({delayed:!0,addToggle:!0,exactMatch:!0,value:1,cellText:"",compare:"",min:0,max:100,step:1,disabled:!1},e),c=b.closest("table")[0].config,l=g('<input class="filter" type="hidden">').appendTo(b).bind("change"+c.namespace+"filter", function(){d({value:this.value,delayed:!1})}),h=[],d=function(f,k){var p=!0,d,q=f&&f.value&&r.formatFloat((f.value+"").replace(/[><=]/g,""))||b.find(".spinner").val()||a.value,e=(g.isArray(a.compare)?b.find(".compare-select").val()||a.compare[a.selected||0]:a.compare)||"",l=f&&"boolean"===typeof f.delayed?f.delayed:c.$table[0].hasInitialized?a.delayed||"":!0;a.addToggle&&(p=b.find(".toggle").is(":checked"));d=a.disabled||!p?"disable":"enable";b.find(".filter").val(p?(e?e:a.exactMatch?"=":"")+q:"").trigger(k? "":"search",l).end().find(".spinner").spinner(d).val(q);h.length&&(h.find(".spinner").spinner(d).val(q).end().find(".compare-select").val(e),a.addToggle&&(h.find(".toggle")[0].checked=p))};a.oldcreate=a.create;a.oldspin=a.spin;a.create=function(b,k){d();"function"===typeof a.oldcreate&&a.oldcreate(b,k)};a.spin=function(b,k){d(k);"function"===typeof a.oldspin&&a.oldspin(b,k)};a.addToggle&&g('<div class="button"><input id="uispinnerbutton'+f+'" type="checkbox" class="toggle" /><label for="uispinnerbutton'+ f+'"></label></div>').appendTo(b).find(".toggle").bind("change",function(){d()});b.closest("thead").find("th[data-column="+f+"]").addClass("filter-parsed");g('<input class="spinner spinner'+f+'" />').val(a.value).appendTo(b).spinner(a).bind("change keyup",function(){d()});c.$table.bind("filterFomatterUpdate",function(){var c=n.updateCompare(b,l,a)[0];b.find(".spinner").val(c);d({value:c},!0)});a.compare&&(n.addCompare(b,f,a),b.find(".compare-select").bind("change",function(){d()}));c.$table.bind("stickyHeadersInit", function(){h=c.widgetOptions.$sticky.find(".tablesorter-filter-row").children().eq(f).empty();a.addToggle&&g('<div class="button"><input id="stickyuispinnerbutton'+f+'" type="checkbox" class="toggle" /><label for="stickyuispinnerbutton'+f+'"></label></div>').appendTo(h).find(".toggle").bind("change",function(){b.find(".toggle")[0].checked=this.checked;d()});g('<input class="spinner spinner'+f+'" />').val(a.value).appendTo(h).spinner(a).bind("change keyup",function(){b.find(".spinner").val(this.value); d()});a.compare&&(n.addCompare(h,f,a),h.find(".compare-select").bind("change",function(){b.find(".compare-select").val(g(this).val());d()}))});c.$table.bind("filterReset",function(){g.isArray(a.compare)&&b.add(h).find(".compare-select").val(a.compare[a.selected||0]);a.addToggle&&(b.find(".toggle")[0].checked=!1);b.find(".spinner").spinner("value",a.value);setTimeout(function(){d()},0)});d();return l},uiSlider:function(b,f,e){var a=g.extend({delayed:!0,valueToHeader:!1,exactMatch:!0,cellText:"",compare:"", allText:"all",value:0,min:0,max:100,step:1,range:"min"},e),c=b.closest("table")[0].config,l=g('<input class="filter" type="hidden">').appendTo(b).bind("change"+c.namespace+"filter",function(){d({value:this.value})}),h=[],d=function(d,k){var p="undefined"!==typeof d?r.formatFloat((d.value+"").replace(/[><=]/g,""))||a.value:a.value,e=a.compare?p:p===a.min?a.allText:p,q=(g.isArray(a.compare)?b.find(".compare-select").val()||a.compare[a.selected||0]:a.compare)||"",e=q+e,l=d&&"boolean"===typeof d.delayed? d.delayed:c.$table[0].hasInitialized?a.delayed||"":!0;a.valueToHeader?b.closest("thead").find("th[data-column="+f+"]").find(".curvalue").html(" ("+e+")"):b.find(".ui-slider-handle").addClass("value-popup").attr("data-value",e);b.find(".filter").val(q?q+p:p===a.min?"":(a.exactMatch?"=":"")+p).trigger(k?"":"search",l).end().find(".slider").slider("value",p);h.length&&(h.find(".compare-select").val(q).end().find(".slider").slider("value",p),a.valueToHeader?h.closest("thead").find("th[data-column="+f+ "]").find(".curvalue").html(" ("+e+")"):h.find(".ui-slider-handle").addClass("value-popup").attr("data-value",e))};b.closest("thead").find("th[data-column="+f+"]").addClass("filter-parsed");a.valueToHeader&&b.closest("thead").find("th[data-column="+f+"]").find(".tablesorter-header-inner").append('<span class="curvalue" />');a.oldcreate=a.create;a.oldslide=a.slide;a.create=function(b,k){d();"function"===typeof a.oldcreate&&a.oldcreate(b,k)};a.slide=function(b,k){d(k);"function"===typeof a.oldslide&& a.oldslide(b,k)};g('<div class="slider slider'+f+'"/>').appendTo(b).slider(a);c.$table.bind("filterFomatterUpdate",function(){var c=n.updateCompare(b,l,a)[0];b.find(".slider").slider("value",c);d({value:c},!1)});a.compare&&(n.addCompare(b,f,a),b.find(".compare-select").bind("change",function(){d({value:b.find(".slider").slider("value")})}));c.$table.bind("filterReset",function(){g.isArray(a.compare)&&b.add(h).find(".compare-select").val(a.compare[a.selected||0]);setTimeout(function(){d({value:a.value})}, 0)});c.$table.bind("stickyHeadersInit",function(){h=c.widgetOptions.$sticky.find(".tablesorter-filter-row").children().eq(f).empty();g('<div class="slider slider'+f+'"/>').val(a.value).appendTo(h).slider(a).bind("change keyup",function(){b.find(".slider").slider("value",this.value);d()});a.compare&&(n.addCompare(h,f,a),h.find(".compare-select").bind("change",function(){b.find(".compare-select").val(g(this).val());d()}))});return l},uiRange:function(b,f,e){var a=g.extend({delayed:!0,valueToHeader:!1, values:[0,100],min:0,max:100,range:!0},e),c=b.closest("table")[0].config,l=g('<input class="filter" type="hidden">').appendTo(b).bind("change"+c.namespace+"filter",function(){d()}),h=[],d=function(){var b=l.val(),c=b.split(" - ");""===b&&(c=[a.min,a.max]);c&&c[1]&&m({values:c,delay:!1},!0)},m=function(k,p){var d=k&&k.values||a.values,e=d[0]+" - "+d[1],g=d[0]===a.min&&d[1]===a.max?"":e,l=k&&"boolean"===typeof k.delayed?k.delayed:c.$table[0].hasInitialized?a.delayed||"":!0;a.valueToHeader?b.closest("thead").find("th[data-column="+ f+"]").find(".currange").html(" ("+e+")"):b.find(".ui-slider-handle").addClass("value-popup").eq(0).attr("data-value",d[0]).end().eq(1).attr("data-value",d[1]);b.find(".filter").val(g).trigger(p?"":"search",l).end().find(".range").slider("values",d);h.length&&(h.find(".range").slider("values",d),a.valueToHeader?h.closest("thead").find("th[data-column="+f+"]").find(".currange").html(" ("+e+")"):h.find(".ui-slider-handle").addClass("value-popup").eq(0).attr("data-value",d[0]).end().eq(1).attr("data-value", d[1]))};b.closest("thead").find("th[data-column="+f+"]").addClass("filter-parsed");a.valueToHeader&&b.closest("thead").find("th[data-column="+f+"]").find(".tablesorter-header-inner").append('<span class="currange"/>');a.oldcreate=a.create;a.oldslide=a.slide;a.create=function(b,c){m();"function"===typeof a.oldcreate&&a.oldcreate(b,c)};a.slide=function(b,c){m(c);"function"===typeof a.oldslide&&a.oldslide(b,c)};g('<div class="range range'+f+'"/>').appendTo(b).slider(a);c.$table.bind("filterFomatterUpdate", function(){d()});c.$table.bind("filterReset",function(){b.find(".range").slider("values",a.values);setTimeout(function(){m()},0)});c.$table.bind("stickyHeadersInit",function(){h=c.widgetOptions.$sticky.find(".tablesorter-filter-row").children().eq(f).empty();g('<div class="range range'+f+'"/>').val(a.value).appendTo(h).slider(a).bind("change keyup",function(){b.find(".range").val(this.value);m()})});return l},uiDateCompare:function(b,f,e){var a=g.extend({cellText:"",compare:"",endOfDay:!0,defaultDate:"", changeMonth:!0,changeYear:!0,numberOfMonths:1},e),c,l=b.closest("table")[0].config;e=b.closest("thead").find("th[data-column="+f+"]").addClass("filter-parsed");var h=g('<input class="dateCompare" type="hidden">').appendTo(b).bind("change"+l.namespace+"filter",function(){var b=this.value;if(b)a.onClose(b)}),d,m=[],k=function(k){var d,f;d=c.datepicker("getDate")||"";var e=(g.isArray(a.compare)?b.find(".compare-select").val()||a.compare[a.selected||0]:a.compare)||"",h=l.$table[0].hasInitialized?a.delayed|| "":!0;c.datepicker("setDate",(""===d?"":d)||null);""===d&&(k=!1);f=(d=c.datepicker("getDate"))?(a.endOfDay&&/<=/.test(e)?d.setHours(23,59,59):d.getTime())||"":"";d&&a.endOfDay&&"="===e&&(e="",f+=" - "+d.setHours(23,59,59),k=!1);b.find(".dateCompare").val(e+f).trigger(k?"":"search",h).end();m.length&&m.find(".dateCompare").val(e+f).end().find(".compare-select").val(e)};d='<input type="text" class="date date'+f+'" placeholder="'+(e.data("placeholder")||e.attr("data-placeholder")||l.widgetOptions.filter_placeholder.search|| "")+'" />';c=g(d).appendTo(b);a.oldonClose=a.onClose;a.onClose=function(b,c){k();"function"===typeof a.oldonClose&&a.oldonClose(b,c)};c.datepicker(a);l.$table.bind("filterReset",function(){g.isArray(a.compare)&&b.add(m).find(".compare-select").val(a.compare[a.selected||0]);b.add(m).find(".date").val(a.defaultDate).datepicker("setDate",a.defaultDate||null);setTimeout(function(){k()},0)});l.$table.bind("filterFomatterUpdate",function(){var d;d=h.val();/\s+-\s+/.test(d)?(b.find(".compare-select").val("="), d=d.split(/\s+-\s+/)[0],c.datepicker("setDate",d||null)):(d=n.updateCompare(b,h,a)[1].toString()||"",d=""!==d?/\d{5}/g.test(d)?new Date(Number(d)):d||"":"");b.add(m).find(".date").datepicker("setDate",d||null);setTimeout(function(){k(!0)},0)});a.compare&&(n.addCompare(b,f,a),b.find(".compare-select").bind("change",function(){k()}));l.$table.bind("stickyHeadersInit",function(){m=l.widgetOptions.$sticky.find(".tablesorter-filter-row").children().eq(f).empty();m.append(d).find(".date").datepicker(a); a.compare&&(n.addCompare(m,f,a),m.find(".compare-select").bind("change",function(){b.find(".compare-select").val(g(this).val());k()}))});return h.val(a.defaultDate?a.defaultDate:"")},uiDatepicker:function(b,f,e){var a=g.extend({endOfDay:!0,textFrom:"from",textTo:"to",from:"",to:"",changeMonth:!0,changeYear:!0,numberOfMonths:1},e),c,l,h=[],d=b.closest("table")[0].config,m=g('<input class="dateRange" type="hidden">').appendTo(b).bind("change"+d.namespace+"filter",function(){var a=this.value;a.match(" - ")? (a=a.split(" - "),b.find(".dateTo").val(a[1]),l(a[0])):a.match(">=")?l(a.replace(">=","")):a.match("<=")&&l(a.replace("<=",""))});e=b.closest("thead").find("th[data-column="+f+"]").addClass("filter-parsed");c="<label>"+a.textFrom+'</label><input type="text" class="dateFrom" placeholder="'+(e.data("placeholderFrom")||e.attr("data-placeholder-from")||d.widgetOptions.filter_placeholder.from||"")+'" /><label>'+a.textTo+'</label><input type="text" class="dateTo" placeholder="'+(e.data("placeholderTo")|| e.attr("data-placeholder-to")||d.widgetOptions.filter_placeholder.to||"")+'" />';g(c).appendTo(b);a.oldonClose=a.onClose;l=a.onClose=function(c,d){var f,e=b.find(".dateFrom").datepicker("getDate"),g=b.find(".dateTo").datepicker("getDate"),e=e instanceof Date&&isFinite(e)?e.getTime():"",g=g instanceof Date&&isFinite(g)?(a.endOfDay?g.setHours(23,59,59):g.getTime())||"":"";f=e?g?e+" - "+g:">="+e:g?"<="+g:"";b.add(h).find(".dateRange").val(f).trigger("search");e=e?new Date(e):"";g=g?new Date(g):"";/<=/.test(f)? b.add(h).find(".dateFrom").datepicker("option","maxDate",g||null).end().find(".dateTo").datepicker("option","minDate",null).datepicker("setDate",g||null):/>=/.test(f)?b.add(h).find(".dateFrom").datepicker("option","maxDate",null).datepicker("setDate",e||null).end().find(".dateTo").datepicker("option","minDate",e||null):b.add(h).find(".dateFrom").datepicker("option","maxDate",null).datepicker("setDate",e||null).end().find(".dateTo").datepicker("option","minDate",null).datepicker("setDate",g||null); "function"===typeof a.oldonClose&&a.oldonClose(c,d)};a.defaultDate=a.from||"";b.find(".dateFrom").datepicker(a);a.defaultDate=a.to||"+7d";b.find(".dateTo").datepicker(a);d.$table.bind("filterFomatterUpdate",function(){var a=m.val()||"",c="",d="";/\s+-\s+/.test(a)?(a=a.split(/\s+-\s+/)||[],c=a[0]||"",d=a[1]||""):/>=/.test(a)?c=a.replace(/>=/,"")||"":/<=/.test(a)&&(d=a.replace(/<=/,"")||"");c=""!==c?/\d{5}/g.test(c)?new Date(Number(c)):c||"":"";d=""!==d?/\d{5}/g.test(d)?new Date(Number(d)):d||"":""; b.add(h).find(".dateFrom").datepicker("setDate",c||null);b.add(h).find(".dateTo").datepicker("setDate",d||null);setTimeout(function(){l()},0)});d.$table.bind("stickyHeadersInit",function(){h=d.widgetOptions.$sticky.find(".tablesorter-filter-row").children().eq(f).empty();h.append(c);a.defaultDate=a.from||"";h.find(".dateFrom").datepicker(a);a.defaultDate=a.to||"+7d";h.find(".dateTo").datepicker(a)});b.closest("table").bind("filterReset",function(){b.add(h).find(".dateFrom").val("").datepicker("setDate", a.from||null);b.add(h).find(".dateTo").val("").datepicker("setDate",a.to||null);setTimeout(function(){l()},0)});return m.val(a.from?a.to?a.from+" - "+a.to:">="+a.from:a.to?"<="+a.to:"")},html5Number:function(b,f,e){var a,c=g.extend({value:0,min:0,max:100,step:1,delayed:!0,disabled:!1,addToggle:!1,exactMatch:!1,cellText:"",compare:"",skipTest:!1},e),l;e=g('<input type="number" style="visibility:hidden;" value="test">').appendTo(b);var h=c.skipTest||"number"===e.attr("type")&&"test"!==e.val(),d=[], m=b.closest("table")[0].config,k=function(a,f){var e=c.addToggle?b.find(".toggle").is(":checked"):!0,k=b.find(".number").val(),h=(g.isArray(c.compare)?b.find(".compare-select").val()||c.compare[c.selected||0]:c.compare)||"",n=m.$table[0].hasInitialized?(a?a:c.delayed)||"":!0;l.val(!c.addToggle||e?(h?h:c.exactMatch?"=":"")+k:"").trigger(f?"":"search",n).end().find(".number").val(k);b.find(".number").length&&(b.find(".number")[0].disabled=c.disabled||!e);d.length&&(d.find(".number").val(k)[0].disabled= c.disabled||!e,d.find(".compare-select").val(h),c.addToggle&&(d.find(".toggle")[0].checked=e))};e.remove();h&&(a=c.addToggle?'<div class="button"><input id="html5button'+f+'" type="checkbox" class="toggle" /><label for="html5button'+f+'"></label></div>':"",a+='<input class="number" type="number" min="'+c.min+'" max="'+c.max+'" value="'+c.value+'" step="'+c.step+'" />',b.append(a+'<input type="hidden" />').find(".toggle, .number").bind("change",function(){k()}).closest("thead").find("th[data-column="+ f+"]").addClass("filter-parsed").closest("table").bind("filterReset",function(){g.isArray(c.compare)&&b.add(d).find(".compare-select").val(c.compare[c.selected||0]);c.addToggle&&(b.find(".toggle")[0].checked=!1,d.length&&(d.find(".toggle")[0].checked=!1));b.find(".number").val(c.value);setTimeout(function(){k()},0)}),l=b.find("input[type=hidden]").bind("change",function(){b.find(".number").val(this.value);k()}),m.$table.bind("filterFomatterUpdate",function(){var a=n.updateCompare(b,l,c)[0]||c.value; b.find(".number").val(((a||"")+"").replace(/[><=]/g,""));k(!1,!0)}),c.compare&&(n.addCompare(b,f,c),b.find(".compare-select").bind("change",function(){k()})),m.$table.bind("stickyHeadersInit",function(){d=m.widgetOptions.$sticky.find(".tablesorter-filter-row").children().eq(f).empty();d.append(a).find(".toggle, .number").bind("change",function(){b.find(".number").val(g(this).val());k()});c.compare&&(n.addCompare(d,f,c),d.find(".compare-select").bind("change",function(){b.find(".compare-select").val(g(this).val()); k()}));k()}),k());return h?b.find('input[type="hidden"]'):g('<input type="search">')},html5Range:function(b,f,e){var a=g.extend({value:0,min:0,max:100,step:1,delayed:!0,valueToHeader:!0,exactMatch:!0,cellText:"",compare:"",allText:"all",skipTest:!1},e),c;e=g('<input type="range" style="visibility:hidden;" value="test">').appendTo(b);var l=a.skipTest||"range"===e.attr("type")&&"test"!==e.val(),h=[],d=b.closest("table")[0].config,m=function(e,l,m){e=("undefined"===typeof e?c.val():e).toString().replace(/[<>=]/g, "")||a.value;var q=(g.isArray(a.compare)?b.find(".compare-select").val()||a.compare[a.selected||0]:a.compare)||"",n=" ("+(q?q+e:e==a.min?a.allText:e)+")";l=d.$table[0].hasInitialized?(l?l:a.delayed)||"":!0;b.find("input[type=hidden]").val(q?q+e:e==a.min?"":(a.exactMatch?"=":"")+e).trigger(m?"":"search",l).end().find(".range").val(e);b.closest("thead").find("th[data-column="+f+"]").find(".curvalue").html(n);h.length&&(h.find(".range").val(e).end().find(".compare-select").val(q),h.closest("thead").find("th[data-column="+ f+"]").find(".curvalue").html(n))};e.remove();l&&(b.html('<input type="hidden"><input class="range" type="range" min="'+a.min+'" max="'+a.max+'" value="'+a.value+'" />').closest("thead").find("th[data-column="+f+"]").addClass("filter-parsed").find(".tablesorter-header-inner").append('<span class="curvalue" />'),c=b.find("input[type=hidden]").bind("change"+d.namespace+"filter",function(){var c=this.value,d=(g.isArray(a.compare)?b.find(".compare-select").val()||a.compare[a.selected||0]:a.compare)|| "";c!==this.lastValue&&(this.value=this.lastValue=d?d+c:c==a.min?"":(a.exactMatch?"=":"")+c,m(c))}),b.find(".range").bind("change",function(){m(this.value)}),d.$table.bind("filterFomatterUpdate",function(){var d=n.updateCompare(b,c,a)[0];b.find(".range").val(d);m(d,!1,!0)}),a.compare&&(n.addCompare(b,f,a),b.find(".compare-select").bind("change",function(){m()})),d.$table.bind("stickyHeadersInit",function(){h=d.widgetOptions.$sticky.find(".tablesorter-filter-row").children().eq(f).empty();h.html('<input class="range" type="range" min="'+ a.min+'" max="'+a.max+'" value="'+a.value+'" />').find(".range").bind("change",function(){m(h.find(".range").val())});m();a.compare&&(n.addCompare(h,f,a),h.find(".compare-select").bind("change",function(){b.find(".compare-select").val(g(this).val());m()}))}),b.closest("table").bind("filterReset",function(){g.isArray(a.compare)&&b.add(h).find(".compare-select").val(a.compare[a.selected||0]);setTimeout(function(){m(a.value,!1,!0)},0)}),m());return l?b.find('input[type="hidden"]'):g('<input type="search">')}, html5Color:function(b,f,e){var a,c=g.extend({value:"#000000",disabled:!1,addToggle:!0,exactMatch:!0,valueToHeader:!1,skipTest:!1},e),l;e=g('<input type="color" style="visibility:hidden;" value="test">').appendTo(b);var h=c.skipTest||"color"===e.attr("type")&&"test"!==e.val(),d=[],m=b.closest("table")[0].config,k=function(a,e){a=("undefined"===typeof a?l.val():a).toString().replace("=","")||c.value;var g=!0,h=" ("+a+")";c.addToggle&&(g=b.find(".toggle").is(":checked"));b.find(".colorpicker").length&& (b.find(".colorpicker").val(a)[0].disabled=c.disabled||!g);l.val(g?a+(c.exactMatch?"=":""):"").trigger(!m.$table[0].hasInitialized||e?"":"search");c.valueToHeader?b.closest("thead").find("th[data-column="+f+"]").find(".curcolor").html(h):b.find(".currentColor").html(h);d.length&&(d.find(".colorpicker").val(a)[0].disabled=c.disabled||!g,c.addToggle&&(d.find(".toggle")[0].checked=g),c.valueToHeader?d.closest("thead").find("th[data-column="+f+"]").find(".curcolor").html(h):d.find(".currentColor").html(h))}; e.remove();h&&(a=""+f+Math.round(100*Math.random()),a='<div class="color-controls-wrapper">'+(c.addToggle?'<div class="button"><input id="colorbutton'+a+'" type="checkbox" class="toggle" /><label for="colorbutton'+a+'"></label></div>':"")+'<input type="hidden"><input class="colorpicker" type="color" />'+(c.valueToHeader?"":'<span class="currentColor">(#000000)</span>')+"</div>",b.html(a),c.valueToHeader&&b.closest("thead").find("th[data-column="+f+"]").find(".tablesorter-header-inner").append('<span class="curcolor" />'), b.find(".toggle, .colorpicker").bind("change",function(){k(b.find(".colorpicker").val())}),l=b.find("input[type=hidden]").bind("change"+m.namespace+"filter",function(){k(this.value)}),m.$table.bind("filterFomatterUpdate",function(){k(l.val(),!0)}),b.closest("table").bind("filterReset",function(){c.addToggle&&(b.find(".toggle")[0].checked=!1);setTimeout(function(){k()},0)}),m.$table.bind("stickyHeadersInit",function(){d=m.widgetOptions.$sticky.find(".tablesorter-filter-row").children().eq(f);d.html(a).find(".toggle, .colorpicker").bind("change", function(){k(d.find(".colorpicker").val())});k(d.find(".colorpicker").val())}),k(c.value));return h?b.find('input[type="hidden"]'):g('<input type="search">')}}})(jQuery);
\ No newline at end of file
diff --git a/js/jquery.tablesorter.widgets.js b/js/jquery.tablesorter.widgets.js
index a8e7dc5e..ed8cf7eb 100644
--- a/js/jquery.tablesorter.widgets.js
+++ b/js/jquery.tablesorter.widgets.js
@@ -1,16 +1,90 @@
-/*! tableSorter (FORK) 2.16+ widgets - updated 2/9/2015 (v2.19.1)
- *
- * Column Styles
- * Column Filters
- * Column Resizing
- * Sticky Header
- * UI Theme (generalized)
- * Save Sort
- * [ "columns", "filter", "resizable", "stickyHeaders", "uitheme", "saveSort" ]
- */
-/*jshint browser:true, jquery:true, unused:false, loopfunc:true */
-/*global jQuery: false, localStorage: false */
-;(function ($, window) {
+/*** This file is dynamically generated ***
+█████▄ ▄████▄   █████▄ ▄████▄ ██████   ███████▄ ▄████▄ █████▄ ██ ██████ ██  ██
+██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██     ██  ██
+██  ██ ██  ██   ██  ██ ██  ██   ██     ██ ██ ██ ██  ██ ██  ██ ██ ██▀▀   ▀▀▀▀██
+█████▀ ▀████▀   ██  ██ ▀████▀   ██     ██ ██ ██ ▀████▀ █████▀ ██ ██     █████▀
+*/
+/*! tablesorter (FORK) widgets - updated 02-12-2015 (v2.19.1)*/
+/* Includes: storage,uitheme,columns,filter,stickyHeaders,resizable,saveSort */
+/*! Widget: storage */
+;(function ($, window, document) {
+'use strict';
+
+var ts = $.tablesorter = $.tablesorter || {};
+// *** Store data in local storage, with a cookie fallback ***
+/* IE7 needs JSON library for JSON.stringify - (http://caniuse.com/#search=json)
+   if you need it, then include https://github.com/douglascrockford/JSON-js
+
+   $.parseJSON is not available is jQuery versions older than 1.4.1, using older
+   versions will only allow storing information for one page at a time
+
+   // *** Save data (JSON format only) ***
+   // val must be valid JSON... use http://jsonlint.com/ to ensure it is valid
+   var val = { "mywidget" : "data1" }; // valid JSON uses double quotes
+   // $.tablesorter.storage(table, key, val);
+   $.tablesorter.storage(table, 'tablesorter-mywidget', val);
+
+   // *** Get data: $.tablesorter.storage(table, key); ***
+   v = $.tablesorter.storage(table, 'tablesorter-mywidget');
+   // val may be empty, so also check for your data
+   val = (v && v.hasOwnProperty('mywidget')) ? v.mywidget : '';
+   alert(val); // "data1" if saved, or "" if not
+*/
+ts.storage = function(table, key, value, options) {
+	table = $(table)[0];
+	var cookieIndex, cookies, date,
+		hasLocalStorage = false,
+		values = {},
+		c = table.config,
+		$table = $(table),
+		id = options && options.id || $table.attr(options && options.group ||
+			'data-table-group') || table.id || $('.tablesorter').index( $table ),
+		url = options && options.url || $table.attr(options && options.page ||
+			'data-table-page') || c && c.fixedUrl || window.location.pathname;
+	// https://gist.github.com/paulirish/5558557
+	if ('localStorage' in window) {
+		try {
+			window.localStorage.setItem('_tmptest', 'temp');
+			hasLocalStorage = true;
+			window.localStorage.removeItem('_tmptest');
+		} catch(error) {}
+	}
+	// *** get value ***
+	if ($.parseJSON) {
+		if (hasLocalStorage) {
+			values = $.parseJSON(localStorage[key] || 'null') || {};
+		} else {
+			// old browser, using cookies
+			cookies = document.cookie.split(/[;\s|=]/);
+			// add one to get from the key to the value
+			cookieIndex = $.inArray(key, cookies) + 1;
+			values = (cookieIndex !== 0) ? $.parseJSON(cookies[cookieIndex] || 'null') || {} : {};
+		}
+	}
+	// allow value to be an empty string too
+	if ((value || value === '') && window.JSON && JSON.hasOwnProperty('stringify')) {
+		// add unique identifiers = url pathname > table ID/index on page > data
+		if (!values[url]) {
+			values[url] = {};
+		}
+		values[url][id] = value;
+		// *** set value ***
+		if (hasLocalStorage) {
+			localStorage[key] = JSON.stringify(values);
+		} else {
+			date = new Date();
+			date.setTime(date.getTime() + (31536e+6)); // 365 days
+			document.cookie = key + '=' + (JSON.stringify(values)).replace(/\"/g,'\"') + '; expires=' + date.toGMTString() + '; path=/';
+		}
+	} else {
+		return values && values[url] ? values[url][id] : '';
+	}
+};
+
+})(jQuery, window, document);
+
+/*! Widget: uitheme */
+;(function ($) {
 'use strict';
 var ts = $.tablesorter = $.tablesorter || {};
 
@@ -60,129 +134,9 @@ ts.themes = {
 };
 
 $.extend(ts.css, {
-	filterRow : 'tablesorter-filter-row',   // filter
-	filter    : 'tablesorter-filter',
-	wrapper   : 'tablesorter-wrapper',      // ui theme & resizable
-	resizer   : 'tablesorter-resizer',      // resizable
-	sticky    : 'tablesorter-stickyHeader', // stickyHeader
-	stickyVis : 'tablesorter-sticky-visible',
-	stickyWrap: 'tablesorter-sticky-wrapper'
+	wrapper : 'tablesorter-wrapper' // ui theme & resizable
 });
 
-// *** Store data in local storage, with a cookie fallback ***
-/* IE7 needs JSON library for JSON.stringify - (http://caniuse.com/#search=json)
-   if you need it, then include https://github.com/douglascrockford/JSON-js
-
-   $.parseJSON is not available is jQuery versions older than 1.4.1, using older
-   versions will only allow storing information for one page at a time
-
-   // *** Save data (JSON format only) ***
-   // val must be valid JSON... use http://jsonlint.com/ to ensure it is valid
-   var val = { "mywidget" : "data1" }; // valid JSON uses double quotes
-   // $.tablesorter.storage(table, key, val);
-   $.tablesorter.storage(table, 'tablesorter-mywidget', val);
-
-   // *** Get data: $.tablesorter.storage(table, key); ***
-   v = $.tablesorter.storage(table, 'tablesorter-mywidget');
-   // val may be empty, so also check for your data
-   val = (v && v.hasOwnProperty('mywidget')) ? v.mywidget : '';
-   alert(val); // "data1" if saved, or "" if not
-*/
-ts.storage = function(table, key, value, options) {
-	table = $(table)[0];
-	var cookieIndex, cookies, date,
-		hasLocalStorage = false,
-		values = {},
-		c = table.config,
-		$table = $(table),
-		id = options && options.id || $table.attr(options && options.group ||
-			'data-table-group') || table.id || $('.tablesorter').index( $table ),
-		url = options && options.url || $table.attr(options && options.page ||
-			'data-table-page') || c && c.fixedUrl || window.location.pathname;
-	// https://gist.github.com/paulirish/5558557
-	if ("localStorage" in window) {
-		try {
-			window.localStorage.setItem('_tmptest', 'temp');
-			hasLocalStorage = true;
-			window.localStorage.removeItem('_tmptest');
-		} catch(error) {}
-	}
-	// *** get value ***
-	if ($.parseJSON) {
-		if (hasLocalStorage) {
-			values = $.parseJSON(localStorage[key] || 'null') || {};
-		} else {
-			// old browser, using cookies
-			cookies = document.cookie.split(/[;\s|=]/);
-			// add one to get from the key to the value
-			cookieIndex = $.inArray(key, cookies) + 1;
-			values = (cookieIndex !== 0) ? $.parseJSON(cookies[cookieIndex] || 'null') || {} : {};
-		}
-	}
-	// allow value to be an empty string too
-	if ((value || value === '') && window.JSON && JSON.hasOwnProperty('stringify')) {
-		// add unique identifiers = url pathname > table ID/index on page > data
-		if (!values[url]) {
-			values[url] = {};
-		}
-		values[url][id] = value;
-		// *** set value ***
-		if (hasLocalStorage) {
-			localStorage[key] = JSON.stringify(values);
-		} else {
-			date = new Date();
-			date.setTime(date.getTime() + (31536e+6)); // 365 days
-			document.cookie = key + '=' + (JSON.stringify(values)).replace(/\"/g,'\"') + '; expires=' + date.toGMTString() + '; path=/';
-		}
-	} else {
-		return values && values[url] ? values[url][id] : '';
-	}
-};
-
-// Add a resize event to table headers
-// **************************
-ts.addHeaderResizeEvent = function(table, disable, settings) {
-	table = $(table)[0]; // make sure we're using a dom element
-	var headers,
-		defaults = {
-			timer : 250
-		},
-		options = $.extend({}, defaults, settings),
-		c = table.config,
-		wo = c.widgetOptions,
-		checkSizes = function(triggerEvent) {
-			wo.resize_flag = true;
-			headers = [];
-			c.$headers.each(function() {
-				var $header = $(this),
-					sizes = $header.data('savedSizes') || [0,0], // fixes #394
-					width = this.offsetWidth,
-					height = this.offsetHeight;
-				if (width !== sizes[0] || height !== sizes[1]) {
-					$header.data('savedSizes', [ width, height ]);
-					headers.push(this);
-				}
-			});
-			if (headers.length && triggerEvent !== false) {
-				c.$table.trigger('resize', [ headers ]);
-			}
-			wo.resize_flag = false;
-		};
-	checkSizes(false);
-	clearInterval(wo.resize_timer);
-	if (disable) {
-		wo.resize_flag = false;
-		return false;
-	}
-	wo.resize_timer = setInterval(function() {
-		if (wo.resize_flag) { return; }
-		checkSizes();
-	}, options.timer);
-};
-
-// Widget: General UI theme
-// "uitheme" option in "widgetOptions"
-// **************************
 ts.addWidget({
 	id: "uitheme",
 	priority: 10,
@@ -312,10 +266,13 @@ ts.addWidget({
 	}
 });
 
-// Widget: Column styles
-// "columns", "columns_thead" (true) and
-// "columns_tfoot" (true) options in "widgetOptions"
-// **************************
+})(jQuery);
+
+/*! Widget: columns */
+;(function ($) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
 ts.addWidget({
 	id: "columns",
 	priority: 30,
@@ -388,8 +345,18 @@ ts.addWidget({
 	}
 });
 
-// Widget: filter
-// **************************
+})(jQuery);
+
+/*! Widget: filter */
+;(function ($) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+$.extend(ts.css, {
+	filterRow : 'tablesorter-filter-row',
+	filter    : 'tablesorter-filter'
+});
+
 ts.addWidget({
 	id: "filter",
 	priority: 50,
@@ -1660,8 +1627,60 @@ ts.setFilters = function(table, filter, apply, skipFirst) {
 	return !!valid;
 };
 
-// Widget: Sticky headers
-// based on this awesome article:
+})(jQuery);
+
+/*! Widget: stickyHeaders */
+;(function ($, window) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+$.extend(ts.css, {
+	sticky    : 'tablesorter-stickyHeader', // stickyHeader
+	stickyVis : 'tablesorter-sticky-visible',
+	stickyWrap: 'tablesorter-sticky-wrapper'
+});
+
+// Add a resize event to table headers
+ts.addHeaderResizeEvent = function(table, disable, settings) {
+	table = $(table)[0]; // make sure we're using a dom element
+	var headers,
+		defaults = {
+			timer : 250
+		},
+		options = $.extend({}, defaults, settings),
+		c = table.config,
+		wo = c.widgetOptions,
+		checkSizes = function(triggerEvent) {
+			wo.resize_flag = true;
+			headers = [];
+			c.$headers.each(function() {
+				var $header = $(this),
+					sizes = $header.data('savedSizes') || [0,0], // fixes #394
+					width = this.offsetWidth,
+					height = this.offsetHeight;
+				if (width !== sizes[0] || height !== sizes[1]) {
+					$header.data('savedSizes', [ width, height ]);
+					headers.push(this);
+				}
+			});
+			if (headers.length && triggerEvent !== false) {
+				c.$table.trigger('resize', [ headers ]);
+			}
+			wo.resize_flag = false;
+		};
+	checkSizes(false);
+	clearInterval(wo.resize_timer);
+	if (disable) {
+		wo.resize_flag = false;
+		return false;
+	}
+	wo.resize_timer = setInterval(function() {
+		if (wo.resize_flag) { return; }
+		checkSizes();
+	}, options.timer);
+};
+
+// Sticky headers based on this awesome article:
 // http://css-tricks.com/13465-persistent-headers/
 // and https://github.com/jmosbech/StickyTableHeaders by Jonas Mosbech
 // **************************
@@ -1878,7 +1897,17 @@ ts.addWidget({
 	}
 });
 
-// Add Column resizing widget
+})(jQuery, window);
+
+/*! Widget: resizable */
+;(function ($, window) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+$.extend(ts.css, {
+	resizer : 'tablesorter-resizer' // resizable
+});
+
 // this widget saves the column widths if
 // $.tablesorter.storage function is included
 // **************************
@@ -2045,7 +2074,13 @@ ts.resizableReset = function(table, nosave) {
 	});
 };
 
-// Save table sort widget
+})(jQuery, window);
+
+/*! Widget: saveSort */
+;(function ($) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
 // this widget saves the last sort only if the
 // saveSort widget option is true AND the
 // $.tablesorter.storage function is included
@@ -2108,4 +2143,4 @@ ts.addWidget({
 	}
 });
 
-})(jQuery, window);
+})(jQuery);
diff --git a/js/jquery.tablesorter.widgets.min.js b/js/jquery.tablesorter.widgets.min.js
deleted file mode 100644
index bbedc88d..00000000
--- a/js/jquery.tablesorter.widgets.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! tableSorter (FORK) 2.16+ widgets - updated 2/9/2015 (v2.19.1) */
-;(function(h,A){var e=h.tablesorter=h.tablesorter||{};e.themes={bootstrap:{table:"table table-bordered table-striped",caption:"caption",header:"bootstrap-header",sortNone:"",sortAsc:"",sortDesc:"",active:"",hover:"",icons:"",iconSortNone:"bootstrap-icon-unsorted",iconSortAsc:"icon-chevron-up glyphicon glyphicon-chevron-up",iconSortDesc:"icon-chevron-down glyphicon glyphicon-chevron-down",filterRow:"",footerRow:"",footerCells:"",even:"",odd:""},jui:{table:"ui-widget ui-widget-content ui-corner-all", caption:"ui-widget-content",header:"ui-widget-header ui-corner-all ui-state-default",sortNone:"",sortAsc:"",sortDesc:"",active:"ui-state-active",hover:"ui-state-hover",icons:"ui-icon",iconSortNone:"ui-icon-carat-2-n-s",iconSortAsc:"ui-icon-carat-1-n",iconSortDesc:"ui-icon-carat-1-s",filterRow:"",footerRow:"",footerCells:"",even:"ui-widget-content",odd:"ui-state-default"}};h.extend(e.css,{filterRow:"tablesorter-filter-row",filter:"tablesorter-filter",wrapper:"tablesorter-wrapper",resizer:"tablesorter-resizer", sticky:"tablesorter-stickyHeader",stickyVis:"tablesorter-sticky-visible",stickyWrap:"tablesorter-sticky-wrapper"});e.storage=function(d,a,b,c){d=h(d)[0];var f,e,g=!1;f={};e=d.config;var m=h(d);d=c&&c.id||m.attr(c&&c.group||"data-table-group")||d.id||h(".tablesorter").index(m);c=c&&c.url||m.attr(c&&c.page||"data-table-page")||e&&e.fixedUrl||A.location.pathname;if("localStorage"in A)try{A.localStorage.setItem("_tmptest","temp"),g=!0,A.localStorage.removeItem("_tmptest")}catch(n){}h.parseJSON&&(g?f= h.parseJSON(localStorage[a]||"null")||{}:(e=document.cookie.split(/[;\s|=]/),f=h.inArray(a,e)+1,f=0!==f?h.parseJSON(e[f]||"null")||{}:{}));if((b||""===b)&&A.JSON&&JSON.hasOwnProperty("stringify"))f[c]||(f[c]={}),f[c][d]=b,g?localStorage[a]=JSON.stringify(f):(b=new Date,b.setTime(b.getTime()+31536E6),document.cookie=a+"="+JSON.stringify(f).replace(/\"/g,'"')+"; expires="+b.toGMTString()+"; path=/");else return f&&f[c]?f[c][d]:""};e.addHeaderResizeEvent=function(d,a,b){d=h(d)[0];var c;b=h.extend({}, {timer:250},b);var e=d.config,k=e.widgetOptions,g=function(a){k.resize_flag=!0;c=[];e.$headers.each(function(){var a=h(this),b=a.data("savedSizes")||[0,0],d=this.offsetWidth,e=this.offsetHeight;if(d!==b[0]||e!==b[1])a.data("savedSizes",[d,e]),c.push(this)});c.length&&!1!==a&&e.$table.trigger("resize",[c]);k.resize_flag=!1};g(!1);clearInterval(k.resize_timer);if(a)return k.resize_flag=!1;k.resize_timer=setInterval(function(){k.resize_flag||g()},b.timer)};e.addWidget({id:"uitheme",priority:10,format:function(d, a,b){var c,f,k,g,m,n;c=e.themes;g=a.$table.add(a.$extraTables);d=a.$headers.add(a.$extraHeaders);var r=a.theme||"jui",p=c[r]||{},w=h.trim([p.sortNone,p.sortDesc,p.sortAsc,p.active].join(" ")),x=h.trim([p.iconSortNone,p.iconSortDesc,p.iconSortAsc].join(" "));a.debug&&(k=new Date);g.hasClass("tablesorter-"+r)&&a.theme===a.appliedTheme&&b.uitheme_applied||(b.uitheme_applied=!0,c=c[a.appliedTheme]||{},f=(n=!h.isEmptyObject(c))?[c.sortNone,c.sortDesc,c.sortAsc,c.active].join(" "):"",m=n?[c.iconSortNone, c.iconSortDesc,c.iconSortAsc].join(" "):"",n&&(b.zebra[0]=h.trim(" "+b.zebra[0].replace(" "+c.even,"")),b.zebra[1]=h.trim(" "+b.zebra[1].replace(" "+c.odd,"")),a.$tbodies.children().removeClass([c.even,c.odd].join(" "))),p.even&&(b.zebra[0]+=" "+p.even),p.odd&&(b.zebra[1]+=" "+p.odd),g.children("caption").removeClass(c.caption||"").addClass(p.caption),b=g.removeClass((a.appliedTheme?"tablesorter-"+(a.appliedTheme||""):"")+" "+(c.table||"")).addClass("tablesorter-"+r+" "+(p.table||"")).children("tfoot"), a.appliedTheme=a.theme,b.length&&b.children("tr").removeClass(c.footerRow||"").addClass(p.footerRow).children("th, td").removeClass(c.footerCells||"").addClass(p.footerCells),d.removeClass((n?[c.header,c.hover,f].join(" "):"")||"").addClass(p.header).not(".sorter-false").unbind("mouseenter.tsuitheme mouseleave.tsuitheme").bind("mouseenter.tsuitheme mouseleave.tsuitheme",function(a){h(this)["mouseenter"===a.type?"addClass":"removeClass"](p.hover||"")}),d.each(function(){var a=h(this);a.find("."+e.css.wrapper).length|| a.wrapInner('<div class="'+e.css.wrapper+'" style="position:relative;height:100%;width:100%"></div>')}),a.cssIcon&&d.find("."+e.css.icon).removeClass(n?[c.icons,m].join(" "):"").addClass(p.icons||""),g.hasClass("hasFilters")&&g.children("thead").children("."+e.css.filterRow).removeClass(n?c.filterRow||"":"").addClass(p.filterRow||""));for(b=0;b<a.columns;b++)c=a.$headers.add(a.$extraHeaders).not(".sorter-false").filter('[data-column="'+b+'"]'),f=e.css.icon?c.find("."+e.css.icon):h(),g=d.not(".sorter-false").filter('[data-column="'+ b+'"]:last'),g.length&&(c.removeClass(w),f.removeClass(x),g[0].sortDisabled?f.removeClass(p.icons||""):(c=p.sortNone,f=p.iconSortNone,g.hasClass(e.css.sortAsc)?(c=[p.sortAsc,p.active].join(" "),f=p.iconSortAsc):g.hasClass(e.css.sortDesc)&&(c=[p.sortDesc,p.active].join(" "),f=p.iconSortDesc),g.addClass(c).find("."+e.css.icon).addClass(f||"")));a.debug&&e.benchmark("Applying "+r+" theme",k)},remove:function(d,a,b,c){if(b.uitheme_applied){d=a.$table;a=a.appliedTheme||"jui";var f=e.themes[a]||e.themes.jui, k=d.children("thead").children(),g=f.sortNone+" "+f.sortDesc+" "+f.sortAsc,h=f.iconSortNone+" "+f.iconSortDesc+" "+f.iconSortAsc;d.removeClass("tablesorter-"+a+" "+f.table);b.uitheme_applied=!1;c||(d.find(e.css.header).removeClass(f.header),k.unbind("mouseenter.tsuitheme mouseleave.tsuitheme").removeClass(f.hover+" "+g+" "+f.active).filter("."+e.css.filterRow).removeClass(f.filterRow),k.find("."+e.css.icon).removeClass(f.icons+" "+h))}}});e.addWidget({id:"columns",priority:30,options:{columns:["primary", "secondary","tertiary"]},format:function(d,a,b){var c,f,k,g,m,n,r=a.$table,p=a.$tbodies,w=a.sortList,x=w.length,u=b&&b.columns||["primary","secondary","tertiary"],t=u.length-1;m=u.join(" ");for(c=0;c<p.length;c++)a=e.processTbody(d,p.eq(c),!0),f=a.children("tr"),f.each(function(){k=h(this);if("none"!==this.style.display&&(g=k.children().removeClass(m),w&&w[0]&&(g.eq(w[0][0]).addClass(u[0]),1<x)))for(n=1;n<x;n++)g.eq(w[n][0]).addClass(u[n]||u[t])}),e.processTbody(d,a,!1);d=!1!==b.columns_thead?["thead tr"]: [];!1!==b.columns_tfoot&&d.push("tfoot tr");if(d.length&&(f=r.find(d.join(",")).children().removeClass(m),x))for(n=0;n<x;n++)f.filter('[data-column="'+w[n][0]+'"]').addClass(u[n]||u[t])},remove:function(d,a,b){var c=a.$tbodies,f=(b.columns||["primary","secondary","tertiary"]).join(" ");a.$headers.removeClass(f);a.$table.children("tfoot").children("tr").children("th, td").removeClass(f);for(a=0;a<c.length;a++)b=e.processTbody(d,c.eq(a),!0),b.children("tr").each(function(){h(this).children().removeClass(f)}), e.processTbody(d,b,!1)}});e.addWidget({id:"filter",priority:50,options:{filter_childRows:!1,filter_columnFilters:!0,filter_cellFilter:"",filter_cssFilter:"",filter_defaultFilter:{},filter_excludeFilter:{},filter_external:"",filter_filteredRow:"filtered",filter_formatter:null,filter_functions:null,filter_hideEmpty:!0,filter_hideFilters:!1,filter_ignoreCase:!0,filter_liveSearch:!0,filter_onlyAvail:"filter-onlyAvail",filter_placeholder:{search:"",select:""},filter_reset:null,filter_saveFilters:!1,filter_searchDelay:300, filter_searchFiltered:!0,filter_selectSource:null,filter_startsWith:!1,filter_useParsedData:!1,filter_serversideFiltering:!1,filter_defaultAttrib:"data-value",filter_selectSourceSeparator:"|"},format:function(d,a,b){a.$table.hasClass("hasFilters")||e.filter.init(d,a,b)},remove:function(d,a,b,c){var f;f=a.$table;var k=a.$tbodies;a="addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(a.namespace+"filter ");f.removeClass("hasFilters").unbind(h.trim(a)).find("."+ e.css.filterRow).remove();if(!c){for(c=0;c<k.length;c++)f=e.processTbody(d,k.eq(c),!0),f.children().removeClass(b.filter_filteredRow).show(),e.processTbody(d,f,!1);b.filter_reset&&h(document).undelegate(b.filter_reset,"click.tsfilter")}}});e.filter={regex:{regex:/^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/,child:/tablesorter-childRow/,filtered:/filtered/,type:/undefined|number/,exact:/(^[\"\'=]+)|([\"\'=]+$)/g,nondigit:/[^\w,. \-()]/g,operators:/[<>=]/g,query:"(q|query)"},types:{regex:function(d,a){if(e.filter.regex.regex.test(a.iFilter)){var b, c=e.filter.regex.regex.exec(a.iFilter);try{b=(new RegExp(c[1],c[2])).test(a.iExact)}catch(f){b=!1}return b}return null},operators:function(d,a){if(/^[<>]=?/.test(a.iFilter)){var b,c;b=d.table;var f=a.index,k=a.parsed[f],g=e.formatFloat(a.iFilter.replace(e.filter.regex.operators,""),b),m=d.parsers[f],n=g;if(k||"numeric"===m.type)c=e.filter.parseFilter(d,h.trim(""+a.iFilter.replace(e.filter.regex.operators,"")),f,k,!0),g="number"!==typeof c||""===c||isNaN(c)?g:c;b=!k&&"numeric"!==m.type||isNaN(g)|| "undefined"===typeof a.cache?isNaN(a.iExact)?e.formatFloat(a.iExact.replace(e.filter.regex.nondigit,""),b):e.formatFloat(a.iExact,b):a.cache;/>/.test(a.iFilter)&&(c=/>=/.test(a.iFilter)?b>=g:b>g);/</.test(a.iFilter)&&(c=/<=/.test(a.iFilter)?b<=g:b<g);c||""!==n||(c=!0);return c}return null},notMatch:function(d,a){if(/^\!/.test(a.iFilter)){var b,c=e.filter.parseFilter(d,a.iFilter.replace("!",""),a.index,a.parsed[a.index]);if(e.filter.regex.exact.test(c))return c=c.replace(e.filter.regex.exact,""),""=== c?!0:h.trim(c)!==a.iExact;b=a.iExact.search(h.trim(c));return""===c?!0:!(d.widgetOptions.filter_startsWith?0===b:0<=b)}return null},exact:function(d,a){if(e.filter.regex.exact.test(a.iFilter)){var b=e.filter.parseFilter(d,a.iFilter.replace(e.filter.regex.exact,""),a.index,a.parsed[a.index]);return a.anyMatch?0<=h.inArray(b,a.rowArray):b==a.iExact}return null},and:function(d,a){if(e.filter.regex.andTest.test(a.filter)){for(var b=a.index,c=a.parsed[b],f=a.iFilter.split(e.filter.regex.andSplit),k=0<= a.iExact.search(h.trim(e.filter.parseFilter(d,f[0],b,c))),g=f.length-1;k&&g;)k=k&&0<=a.iExact.search(h.trim(e.filter.parseFilter(d,f[g],b,c))),g--;return k}return null},range:function(d,a){if(e.filter.regex.toTest.test(a.iFilter)){var b,c;c=d.table;var f=a.index,k=a.parsed[f],g=a.iFilter.split(e.filter.regex.toSplit),h=e.formatFloat(e.filter.parseFilter(d,g[0].replace(e.filter.regex.nondigit,""),f,k),c),n=e.formatFloat(e.filter.parseFilter(d,g[1].replace(e.filter.regex.nondigit,""),f,k),c);if(k|| "numeric"===d.parsers[f].type)b=d.parsers[f].format(""+g[0],c,d.$headers.eq(f),f),h=""===b||isNaN(b)?h:b,b=d.parsers[f].format(""+g[1],c,d.$headers.eq(f),f),n=""===b||isNaN(b)?n:b;b=!k&&"numeric"!==d.parsers[f].type||isNaN(h)||isNaN(n)?isNaN(a.iExact)?e.formatFloat(a.iExact.replace(e.filter.regex.nondigit,""),c):e.formatFloat(a.iExact,c):a.cache;h>n&&(c=h,h=n,n=c);return b>=h&&b<=n||""===h||""===n}return null},wild:function(d,a){if(/[\?\*\|]/.test(a.iFilter)||e.filter.regex.orReplace.test(a.filter)){var b= a.index,c=a.parsed[b],c=e.filter.parseFilter(d,a.iFilter.replace(e.filter.regex.orReplace,"|"),b,c);!d.$headers.filter('[data-column="'+b+'"]:last').hasClass("filter-match")&&/\|/.test(c)&&("|"===c[c.length-1]&&(c+="*"),c=a.anyMatch&&h.isArray(a.rowArray)?"("+c+")":"^("+c+")$");return(new RegExp(c.replace(/\?/g,"\\S{1}").replace(/\*/g,"\\S*"))).test(a.iExact)}return null},fuzzy:function(d,a){if(/^~/.test(a.iFilter)){var b,c=0,f=a.iExact.length,k=e.filter.parseFilter(d,a.iFilter.slice(1),a.index,a.parsed[a.index]); for(b=0;b<f;b++)a.iExact[b]===k[c]&&(c+=1);return c===k.length?!0:!1}return null}},init:function(d,a,b){e.language=h.extend(!0,{},{to:"to",or:"or",and:"and"},e.language);var c,f,k,g,m,n,r,p;c=e.filter.regex;a.$table.addClass("hasFilters");b.searchTimer=null;b.filter_initTimer=null;b.filter_formatterCount=0;b.filter_formatterInit=[];b.filter_anyColumnSelector='[data-column="all"],[data-column="any"]';b.filter_multipleColumnSelector='[data-column*="-"],[data-column*=","]';k="\\{"+e.filter.regex.query+ "\\}";h.extend(c,{child:new RegExp(a.cssChildRow),filtered:new RegExp(b.filter_filteredRow),alreadyFiltered:new RegExp("(\\s+("+e.language.or+"|-|"+e.language.to+")\\s+)","i"),toTest:new RegExp("\\s+(-|"+e.language.to+")\\s+","i"),toSplit:new RegExp("(?:\\s+(?:-|"+e.language.to+")\\s+)","gi"),andTest:new RegExp("\\s+("+e.language.and+"|&&)\\s+","i"),andSplit:new RegExp("(?:\\s+(?:"+e.language.and+"|&&)\\s+)","gi"),orReplace:new RegExp("\\s+("+e.language.or+")\\s+","gi"),iQuery:new RegExp(k,"i"),igQuery:new RegExp(k, "ig")});!1!==b.filter_columnFilters&&a.$headers.filter(".filter-false, .parser-false").length!==a.$headers.length&&e.filter.buildRow(d,a,b);k="addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search ".split(" ").join(a.namespace+"filter ");a.$table.bind(h.trim(k),function(c,f){r=b.filter_hideEmpty&&h.isEmptyObject(a.cache)&&!(a.delayInit&&"appendCache"===c.type);a.$table.find("."+e.css.filterRow).toggleClass(b.filter_filteredRow,r);/(search|filter)/.test(c.type)|| (c.stopPropagation(),e.filter.buildDefault(d,!0));"filterReset"===c.type?(a.$table.find("."+e.css.filter).add(b.filter_$externalFilters).val(""),e.filter.searching(d,[])):"filterEnd"===c.type?e.filter.buildDefault(d,!0):(f="search"===c.type?f:"updateComplete"===c.type?a.$table.data("lastSearch"):"",/(update|add)/.test(c.type)&&"updateComplete"!==c.type&&(a.lastCombinedFilter=null,a.lastSearch=[]),e.filter.searching(d,f,!0));return!1});b.filter_reset&&(b.filter_reset instanceof h?b.filter_reset.click(function(){a.$table.trigger("filterReset")}): h(b.filter_reset).length&&h(document).undelegate(b.filter_reset,"click.tsfilter").delegate(b.filter_reset,"click.tsfilter",function(){a.$table.trigger("filterReset")}));if(b.filter_functions)for(m=0;m<a.columns;m++)if(k=e.getColumnData(d,b.filter_functions,m))if(g=a.$headers.filter('[data-column="'+m+'"]:last').removeClass("filter-select"),p=!(g.hasClass("filter-false")||g.hasClass("parser-false")),c="",!0===k&&p)e.filter.buildSelect(d,m);else if("object"===typeof k&&p){for(f in k)"string"===typeof f&& (c+=""===c?'<option value="">'+(g.data("placeholder")||g.attr("data-placeholder")||b.filter_placeholder.select||"")+"</option>":"",k=r=f,0<=f.indexOf(b.filter_selectSourceSeparator)&&(r=f.split(b.filter_selectSourceSeparator),k=r[1],r=r[0]),c+="<option "+(k===r?"":'data-function-name="'+f+'" ')+'value="'+r+'">'+k+"</option>");a.$table.find("thead").find("select."+e.css.filter+'[data-column="'+m+'"]').append(c)}e.filter.buildDefault(d,!0);e.filter.bindSearch(d,a.$table.find("."+e.css.filter),!0);b.filter_external&& e.filter.bindSearch(d,b.filter_external);b.filter_hideFilters&&e.filter.hideFilters(d,a);a.showProcessing&&a.$table.unbind(h.trim(["filterStart","filterEnd",""].join(a.namespace+"filter "))).bind(h.trim(["filterStart","filterEnd",""].join(a.namespace+"filter ")),function(b,c){g=c?a.$table.find("."+e.css.header).filter("[data-column]").filter(function(){return""!==c[h(this).data("column")]}):"";e.isProcessing(d,"filterStart"===b.type,c?g:"")});a.filteredRows=a.totalRows;a.$table.unbind(h.trim(["tablesorter-initialized", "pagerBeforeInitialized",""].join(a.namespace+"filter "))).bind(h.trim(["tablesorter-initialized","pagerBeforeInitialized",""].join(a.namespace+"filter ")),function(){var b=this.config.widgetOptions;n=e.filter.setDefaults(d,a,b)||[];n.length&&(a.delayInit&&""===n.join("")||e.setFilters(d,n,!0));a.$table.trigger("filterFomatterUpdate");setTimeout(function(){b.filter_initialized||e.filter.filterInitComplete(a)},100)});a.pager&&a.pager.initialized&&!b.filter_initialized&&(a.$table.trigger("filterFomatterUpdate"), setTimeout(function(){e.filter.filterInitComplete(a)},100))},formatterUpdated:function(d,a){var b=d.closest("table")[0].config.widgetOptions;b.filter_initialized||(b.filter_formatterInit[a]=1)},filterInitComplete:function(d){var a=d.widgetOptions,b=0,c=function(){a.filter_initialized=!0;d.$table.trigger("filterInit",d);e.filter.findRows(d.table,d.$table.data("lastSearch")||[])};h.isEmptyObject(a.filter_formatter)?c():(h.each(a.filter_formatterInit,function(a,c){1===c&&b++}),clearTimeout(a.filter_initTimer), a.filter_initialized||b!==a.filter_formatterCount)?a.filter_initialized||(a.filter_initTimer=setTimeout(function(){c()},500)):c()},setDefaults:function(d,a,b){var c,f=e.getFilters(d)||[];b.filter_saveFilters&&e.storage&&(c=e.storage(d,"tablesorter-filters")||[],(d=h.isArray(c))&&""===c.join("")||!d||(f=c));if(""===f.join(""))for(d=0;d<a.columns;d++)f[d]=a.$headers.filter('[data-column="'+d+'"]:last').attr(b.filter_defaultAttrib)||f[d];a.$table.data("lastSearch",f);return f},parseFilter:function(d, a,b,c,e){return e||c?d.parsers[b].format(a,d.table,[],b):a},buildRow:function(d,a,b){var c,f,k,g,m=a.columns;k=h.isArray(b.filter_cellFilter);g='<tr role="row" class="'+e.css.filterRow+'">';for(f=0;f<m;f++)g=k?g+("<td"+(b.filter_cellFilter[f]?' class="'+b.filter_cellFilter[f]+'"':"")+"></td>"):g+("<td"+(""!==b.filter_cellFilter?' class="'+b.filter_cellFilter+'"':"")+"></td>");a.$filters=h(g+"</tr>").appendTo(a.$table.children("thead").eq(0)).find("td");for(f=0;f<m;f++)k=a.$headers.filter('[data-column="'+ f+'"]:last'),g=e.getColumnData(d,b.filter_functions,f),g=b.filter_functions&&g&&"function"!==typeof g||k.hasClass("filter-select"),c=e.getColumnData(d,a.headers,f),c="false"===e.getData(k[0],c,"filter")||"false"===e.getData(k[0],c,"parser"),g?g=h("<select>").appendTo(a.$filters.eq(f)):((g=e.getColumnData(d,b.filter_formatter,f))?(b.filter_formatterCount++,(g=g(a.$filters.eq(f),f))&&0===g.length&&(g=a.$filters.eq(f).children("input")),g&&(0===g.parent().length||g.parent().length&&g.parent()[0]!==a.$filters[f])&& a.$filters.eq(f).append(g)):g=h('<input type="search">').appendTo(a.$filters.eq(f)),g&&g.attr("placeholder",k.data("placeholder")||k.attr("data-placeholder")||b.filter_placeholder.search||"")),g&&(k=(h.isArray(b.filter_cssFilter)?"undefined"!==typeof b.filter_cssFilter[f]?b.filter_cssFilter[f]||"":"":b.filter_cssFilter)||"",g.addClass(e.css.filter+" "+k).attr("data-column",f),c&&(g.attr("placeholder","").addClass("disabled")[0].disabled=!0))},bindSearch:function(d,a,b){d=h(d)[0];a=h(a);if(a.length){var c= d.config,f=c.widgetOptions,k=f.filter_$externalFilters;!0!==b&&(f.filter_$anyMatch=a.filter(f.filter_anyColumnSelector+","+f.filter_multipleColumnSelector),f.filter_$externalFilters=k&&k.length?f.filter_$externalFilters.add(a):a,e.setFilters(d,c.$table.data("lastSearch")||[],!1===b));a.attr("data-lastSearchTime",(new Date).getTime()).unbind(h.trim(["keypress","keyup","search","change",""].join(c.namespace+"filter "))).bind("keyup"+c.namespace+"filter",function(a){h(this).attr("data-lastSearchTime", (new Date).getTime());if(27===a.which)this.value="";else if(!1===f.filter_liveSearch||""!==this.value&&("number"===typeof f.filter_liveSearch&&this.value.length<f.filter_liveSearch||13!==a.which&&8!==a.which&&(32>a.which||37<=a.which&&40>=a.which)))return;e.filter.searching(d,!0,!0)}).bind(h.trim(["search","change","keypress",""].join(c.namespace+"filter ")),function(a){var b=h(this).data("column");if(13===a.which||"search"===a.type||"change"===a.type&&this.value!==c.lastSearch[b])a.preventDefault(), h(this).attr("data-lastSearchTime",(new Date).getTime()),e.filter.searching(d,!1,!0)})}},searching:function(d,a,b){var c=d.config.widgetOptions;clearTimeout(c.searchTimer);"undefined"===typeof a||!0===a?c.searchTimer=setTimeout(function(){e.filter.checkFilters(d,a,b)},c.filter_liveSearch?c.filter_searchDelay:10):e.filter.checkFilters(d,a,b)},checkFilters:function(d,a,b){var c=d.config,f=c.widgetOptions,k=h.isArray(a),g=k?a:e.getFilters(d,!0),m=(g||[]).join("");if(h.isEmptyObject(c.cache))c.delayInit&& c.pager&&c.pager.initialized&&c.$table.trigger("updateCache",[function(){e.filter.checkFilters(d,!1,b)}]);else if(k&&(e.setFilters(d,g,!1,!0!==b),f.filter_initialized||(c.lastCombinedFilter="")),f.filter_hideFilters&&c.$table.find("."+e.css.filterRow).trigger(""===m?"mouseleave":"mouseenter"),c.lastCombinedFilter!==m||!1===a)if(!1===a&&(c.lastCombinedFilter=null,c.lastSearch=[]),f.filter_initialized&&c.$table.trigger("filterStart",[g]),c.showProcessing)setTimeout(function(){e.filter.findRows(d,g, m);return!1},30);else return e.filter.findRows(d,g,m),!1},hideFilters:function(d,a){var b,c,f;h(d).find("."+e.css.filterRow).addClass("hideme").bind("mouseenter mouseleave",function(c){b=h(this);clearTimeout(f);f=setTimeout(function(){/enter|over/.test(c.type)?b.removeClass("hideme"):h(document.activeElement).closest("tr")[0]!==b[0]&&""===a.lastCombinedFilter&&b.addClass("hideme")},200)}).find("input, select").bind("focus blur",function(b){c=h(this).closest("tr");clearTimeout(f);f=setTimeout(function(){if(""=== e.getFilters(a.$table).join(""))c["focus"===b.type?"removeClass":"addClass"]("hideme")},200)})},defaultFilter:function(d,a){if(""===d)return d;var b=e.filter.regex.iQuery,c=a.match(e.filter.regex.igQuery).length,f=1<c?h.trim(d).split(/\s/):[h.trim(d)],k=f.length-1,g=0,m=a;for(1>k&&1<c&&(f[1]=f[0]);b.test(m);)m=m.replace(b,f[g++]||""),b.test(m)&&g<k&&""!==(f[g]||"")&&(m=a.replace(b,m));return m},getLatestSearch:function(d){return d.sort(function(a,b){return h(b).attr("data-lastSearchTime")-h(a).attr("data-lastSearchTime")})}, multipleColumns:function(d,a){var b,c;b=d.widgetOptions;var f=b.filter_initialized||!a.filter(b.filter_anyColumnSelector).length,k=[],g=h.trim(e.filter.getLatestSearch(a).attr("data-column"));f&&/-/.test(g)&&(b=g.match(/(\d+)\s*-\s*(\d+)/g),h.each(b,function(a,b){var c;c=b.split(/\s*-\s*/);var e=parseInt(c[0],10)||0,f=parseInt(c[1],10)||d.columns-1;e>f&&(c=e,e=f,f=c);for(f>=d.columns&&(f=d.columns-1);e<=f;e++)k.push(e);g=g.replace(b,"")}));f&&/,/.test(g)&&(b=g.split(/\s*,\s*/),h.each(b,function(a, b){""!==b&&(c=parseInt(b,10),c<d.columns&&k.push(c))}));if(!k.length)for(c=0;c<d.columns;c++)k.push(c);return k},findRows:function(d,a,b){if(d.config.lastCombinedFilter!==b&&d.config.widgetOptions.filter_initialized){var c,f,k,g,m,n,r,p,w,x,u,t,z,A,y,B,C,G,D,H,F=e.filter.regex,q=d.config,v=q.widgetOptions,I=q.$table.children("tbody"),l={anyMatch:!1},J=["range","notMatch","operators"];l.parsed=q.$headers.map(function(a){return q.parsers&&q.parsers[a]&&q.parsers[a].parsed||e.getData&&"parsed"===e.getData(q.$headers.filter('[data-column="'+ a+'"]:last'),e.getColumnData(d,q.headers,a),"filter")||h(this).hasClass("filter-parsed")}).get();q.debug&&(e.log("Starting filter widget search",a),A=new Date);q.filteredRows=0;q.totalRows=0;b=(a||[]).join("");for(g=0;g<I.length;g++)if(!I.eq(g).hasClass(q.cssInfoBlock||e.css.info)){m=e.processTbody(d,I.eq(g),!0);p=q.columns;f=h(h.map(q.cache[g].normalized,function(a){return a[p].$row.get()}));if(""===b||v.filter_serversideFiltering)f.removeClass(v.filter_filteredRow).not("."+q.cssChildRow).show(); else{f=f.not("."+q.cssChildRow);c=f.length;B=v.filter_searchFiltered;k=q.lastSearch||q.$table.data("lastSearch")||[];if(B)for(n=0;n<p+1;n++)y=a[n]||"",B||(n=p),B=B&&k.length&&0===y.indexOf(k[n]||"")&&!F.alreadyFiltered.test(y)&&!/[=\"\|!]/.test(y)&&!(/(>=?\s*-\d)/.test(y)||/(<=?\s*\d)/.test(y))&&!(""!==y&&q.$filters&&q.$filters.eq(n).find("select").length&&!q.$headers.filter('[data-column="'+n+'"]:last').hasClass("filter-match"));y=f.not("."+v.filter_filteredRow).length;B&&0===y&&(B=!1);q.debug&& e.log("Searching through "+(B&&y<c?y:"all")+" rows");if(v.filter_$anyMatch&&v.filter_$anyMatch.length||a[q.columns])l.anyMatchFlag=!0,l.anyMatchFilter=v.filter_$anyMatch&&e.filter.getLatestSearch(v.filter_$anyMatch).val()||a[q.columns]||"",q.sortLocaleCompare&&(l.anyMatchFilter=e.replaceAccents(l.anyMatchFilter)),v.filter_defaultFilter&&F.iQuery.test(e.getColumnData(d,v.filter_defaultFilter,q.columns,!0)||"")&&(l.anyMatchFilter=e.filter.defaultFilter(l.anyMatchFilter,e.getColumnData(d,v.filter_defaultFilter, q.columns,!0)),B=!1),l.iAnyMatchFilter=v.filter_ignoreCase&&q.ignoreCase?l.anyMatchFilter.toLocaleLowerCase():l.anyMatchFilter;for(k=0;k<c;k++)if(l.cacheArray=q.cache[g].normalized[k],w=f[k].className,!(F.child.test(w)||B&&F.filtered.test(w))){z=!0;w=f.eq(k).nextUntil("tr:not(."+q.cssChildRow+")");l.childRowText=w.length&&v.filter_childRows?w.text():"";l.childRowText=v.filter_ignoreCase?l.childRowText.toLocaleLowerCase():l.childRowText;n=f.eq(k).children();if(l.anyMatchFlag){p=e.filter.multipleColumns(q, v.filter_$anyMatch);l.anyMatch=!0;l.rowArray=n.map(function(a){if(-1<h.inArray(a,p))return l.parsed[a]?a=l.cacheArray[a]:(a=this?this.getAttribute(q.textAttribute)||this.textContent||h(this).text():"",a=h.trim(v.filter_ignoreCase?a.toLowerCase():a),q.sortLocaleCompare&&(a=e.replaceAccents(a))),a}).get();l.filter=l.anyMatchFilter;l.iFilter=l.iAnyMatchFilter;l.exact=l.rowArray.join(" ");l.iExact=v.filter_ignoreCase?l.exact.toLowerCase():l.exact;l.cache=l.cacheArray.slice(0,-1).join(" ");C=null;h.each(e.filter.types, function(a,b){if(0>h.inArray(a,J)&&(u=b(q,l),null!==u))return C=u,!1});if(null!==C)z=C;else if(v.filter_startsWith)for(z=!1,p=q.columns;!z&&0<p;)p--,z=z||0===l.rowArray[p].indexOf(l.iFilter);else z=0<=(l.iExact+l.childRowText).indexOf(l.iFilter);l.anyMatch=!1}for(p=0;p<q.columns;p++)l.filter=a[p],l.index=p,G=(e.getColumnData(d,v.filter_excludeFilter,p,!0)||"").split(/\s+/),l.filter&&(l.cache=l.cacheArray[p],v.filter_useParsedData||l.parsed[p]?l.exact=l.cache:(t=(y=n[p])?h.trim(y.getAttribute(q.textAttribute)|| y.textContent||n.eq(p).text()):"",l.exact=q.sortLocaleCompare?e.replaceAccents(t):t),l.iExact=!F.type.test(typeof l.exact)&&v.filter_ignoreCase?l.exact.toLocaleLowerCase():l.exact,t=z,H=v.filter_columnFilters?q.$filters.add(q.$externalFilters).filter('[data-column="'+p+'"]').find("select option:selected").attr("data-function-name")||"":"",q.sortLocaleCompare&&(l.filter=e.replaceAccents(l.filter)),y=!0,v.filter_defaultFilter&&F.iQuery.test(e.getColumnData(d,v.filter_defaultFilter,p)||"")&&(l.filter= e.filter.defaultFilter(l.filter,e.getColumnData(d,v.filter_defaultFilter,p)),y=!1),l.iFilter=v.filter_ignoreCase?(l.filter||"").toLocaleLowerCase():l.filter,D=e.getColumnData(d,v.filter_functions,p),r=q.$headers.filter('[data-column="'+p+'"]:last'),x=r.hasClass("filter-select"),D||x&&y?!0===D||x?t=r.hasClass("filter-match")?0<=l.iExact.search(l.iFilter):l.filter===l.exact:"function"===typeof D?t=D(l.exact,l.cache,l.filter,p,f.eq(k)):"function"===typeof D[H||l.filter]&&(t=D[H||l.filter](l.exact,l.cache, l.filter,p,f.eq(k))):(C=null,h.each(e.filter.types,function(a,b){if(0>h.inArray(a,G)&&(u=b(q,l),null!==u))return C=u,!1}),null!==C?t=C:(l.exact=(l.iExact+l.childRowText).indexOf(e.filter.parseFilter(q,l.iFilter,p,l.parsed[p])),t=!v.filter_startsWith&&0<=l.exact||v.filter_startsWith&&0===l.exact)),z=t?z:!1);f.eq(k).toggle(z).toggleClass(v.filter_filteredRow,!z);w.length&&w.toggleClass(v.filter_filteredRow,!z)}}q.filteredRows+=f.not("."+v.filter_filteredRow).length;q.totalRows+=f.length;e.processTbody(d, m,!1)}q.lastCombinedFilter=b;q.lastSearch=a;q.$table.data("lastSearch",a);v.filter_saveFilters&&e.storage&&e.storage(d,"tablesorter-filters",a);q.debug&&e.benchmark("Completed filter widget search",A);v.filter_initialized&&q.$table.trigger("filterEnd",q);setTimeout(function(){q.$table.trigger("applyWidgets")},0)}},getOptionSource:function(d,a,b){d=h(d)[0];var c,f=d.config,k=[],g=!1,m=f.widgetOptions.filter_selectSource,n=f.$table.data("lastSearch")||[],r=h.isFunction(m)?!0:e.getColumnData(d,m,a); b&&""!==n[a]&&(b=!1);if(!0===r)g=m(d,a,b);else{if(r instanceof h||"string"===h.type(r)&&0<=r.indexOf("</option>"))return r;h.isArray(r)?g=r:"object"===h.type(m)&&r&&(g=r(d,a,b))}!1===g&&(g=e.filter.getOptions(d,a,b));g=h.grep(g,function(a,b){return h.inArray(a,g)===b});f.$headers.filter('[data-column="'+a+'"]:last').hasClass("filter-select-nosort")||(h.each(g,function(b,c){k.push({t:c,p:f.parsers&&f.parsers[a].format(c,d,[],a)})}),c=f.textSorter||"",k.sort(function(b,f){var g=b.p.toString(),k=f.p.toString(); return h.isFunction(c)?c(g,k,!0,a,d):"object"===typeof c&&c.hasOwnProperty(a)?c[a](g,k,!0,a,d):e.sortNatural?e.sortNatural(g,k):!0}),g=[],h.each(k,function(a,b){g.push(b.t)}));return g},getOptions:function(d,a,b){d=h(d)[0];var c,e,k,g,m=d.config,n=m.widgetOptions,r=m.$table.children("tbody"),p=[];for(c=0;c<r.length;c++)if(!r.eq(c).hasClass(m.cssInfoBlock))for(g=m.cache[c],e=m.cache[c].normalized.length,d=0;d<e;d++)k=g.row?g.row[d]:g.normalized[d][m.columns].$row[0],b&&k.className.match(n.filter_filteredRow)|| (n.filter_useParsedData||m.parsers[a].parsed||m.$headers.filter('[data-column="'+a+'"]:last').hasClass("filter-parsed")?p.push(""+g.normalized[d][a]):(k=k.cells[a])&&p.push(h.trim(k.getAttribute(m.textAttribute)||k.textContent||h(k).text())));return p},buildSelect:function(d,a,b,c,f){d=h(d)[0];a=parseInt(a,10);if(d.config.cache&&!h.isEmptyObject(d.config.cache)){var k,g;g=d.config;var m=g.widgetOptions,n=g.$headers.filter('[data-column="'+a+'"]:last'),n='<option value="">'+(n.data("placeholder")|| n.attr("data-placeholder")||m.filter_placeholder.select||"")+"</option>",r=g.$table.find("thead").find("select."+e.css.filter+'[data-column="'+a+'"]').val();if("undefined"===typeof b||""===b)b=e.filter.getOptionSource(d,a,f);if(h.isArray(b)){for(d=0;d<b.length;d++)f=k=b[d]=(""+b[d]).replace(/\"/g,"&quot;"),0<=k.indexOf(m.filter_selectSourceSeparator)&&(k=k.split(m.filter_selectSourceSeparator),f=k[0],k=k[1]),n+=""!==b[d]?"<option "+(f===k?"":'data-function-name="'+b[d]+'" ')+'value="'+f+'">'+k+"</option>": "";b=[]}g=(g.$filters?g.$filters:g.$table.children("thead")).find("."+e.css.filter);m.filter_$externalFilters&&(g=g&&g.length?g.add(m.filter_$externalFilters):m.filter_$externalFilters);a=g.filter('select[data-column="'+a+'"]');a.length&&(a[c?"html":"append"](n),h.isArray(b)||a.append(b).val(r),a.val(r))}},buildDefault:function(d,a){var b,c,f,h=d.config,g=h.widgetOptions,m=h.columns;for(b=0;b<m;b++)c=h.$headers.filter('[data-column="'+b+'"]:last'),f=!(c.hasClass("filter-false")||c.hasClass("parser-false")), (c.hasClass("filter-select")||!0===e.getColumnData(d,g.filter_functions,b))&&f&&e.filter.buildSelect(d,b,"",a,c.hasClass(g.filter_onlyAvail))}};e.getFilters=function(d,a,b,c){var f,k,g=!1,m=d?h(d)[0].config:"",n=m?m.widgetOptions:"";if(!0!==a&&n&&!n.filter_columnFilters)return h(d).data("lastSearch");if(m&&(m.$filters&&(f=m.$filters.find("."+e.css.filter)),n.filter_$externalFilters&&(f=f&&f.length?f.add(n.filter_$externalFilters):n.filter_$externalFilters),f&&f.length))for(g=b||[],d=0;d<m.columns+ 1;d++)k=d===m.columns?n.filter_anyColumnSelector+","+n.filter_multipleColumnSelector:'[data-column="'+d+'"]',a=f.filter(k),a.length&&(a=e.filter.getLatestSearch(a),h.isArray(b)?(c&&a.slice(1),d===m.columns&&(k=a.filter(n.filter_anyColumnSelector),a=k.length?k:a),a.val(b[d]).trigger("change.tsfilter")):(g[d]=a.val()||"",d===m.columns?a.slice(1).filter('[data-column*="'+a.attr("data-column")+'"]').val(g[d]):a.slice(1).val(g[d])),d===m.columns&&a.length&&(n.filter_$anyMatch=a));0===g.length&&(g=!1); return g};e.setFilters=function(d,a,b,c){var f=d?h(d)[0].config:"";d=e.getFilters(d,!0,a,c);f&&b&&(f.lastCombinedFilter=null,f.lastSearch=[],e.filter.searching(f.table,a,c),f.$table.trigger("filterFomatterUpdate"));return!!d};e.addWidget({id:"stickyHeaders",priority:60,options:{stickyHeaders:"",stickyHeaders_attachTo:null,stickyHeaders_xScroll:null,stickyHeaders_yScroll:null,stickyHeaders_offset:0,stickyHeaders_filteredToTop:!0,stickyHeaders_cloneId:"-sticky",stickyHeaders_addResizeEvent:!0,stickyHeaders_includeCaption:!0, stickyHeaders_zIndex:2},format:function(d,a,b){if(!(a.$table.hasClass("hasStickyHeaders")||0<=h.inArray("filter",a.widgets)&&!a.$table.hasClass("hasFilters"))){var c=a.$table,f=h(b.stickyHeaders_attachTo),k=a.namespace+"stickyheaders ",g=h(b.stickyHeaders_yScroll||b.stickyHeaders_attachTo||A),m=h(b.stickyHeaders_xScroll||b.stickyHeaders_attachTo||A),n=c.children("thead:first").children("tr").not(".sticky-false").children(),r=c.children("tfoot"),p=isNaN(b.stickyHeaders_offset)?h(b.stickyHeaders_offset): "",w=f.length?0:p.length?p.height()||0:parseInt(b.stickyHeaders_offset,10)||0,x=c.parent().closest("."+e.css.table).hasClass("hasStickyHeaders")?c.parent().closest("table.tablesorter")[0].config.widgetOptions.$sticky.parent():[],u=x.length?x.height():0,t=b.$sticky=c.clone().addClass("containsStickyHeaders "+e.css.sticky+" "+b.stickyHeaders).wrap('<div class="'+e.css.stickyWrap+'">'),z=t.parent().css({position:f.length?"absolute":"fixed",padding:parseInt(t.parent().parent().css("padding-left"),10), top:w+u,left:0,visibility:"hidden",zIndex:b.stickyHeaders_zIndex||2}),E=t.children("thead:first"),y,B="",C=0,G=function(a,b){a.filter(":visible").each(function(a){var c;a=b.filter(":visible").eq(a);var d=h(this);"border-box"===d.css("box-sizing")?c=d.outerWidth():"collapse"===a.css("border-collapse")?A.getComputedStyle?c=parseFloat(A.getComputedStyle(this,null).width):(c=parseFloat(d.css("border-width")),c=d.outerWidth()-parseFloat(d.css("padding-left"))-parseFloat(d.css("padding-right"))-c):c=d.width(); a.css({"min-width":c,"max-width":c})})},D=function(){w=p.length?p.height()||0:parseInt(b.stickyHeaders_offset,10)||0;C=0;z.css({left:f.length?parseInt(f.css("padding-left"),10)||0:c.offset().left-parseInt(c.css("margin-left"),10)-m.scrollLeft()-C,width:c.outerWidth()});G(c,t);G(n,y)};a.$extraTables&&a.$extraTables.length?a.$extraTables.add(t):a.$extraTables=t;t.attr("id")&&(t[0].id+=b.stickyHeaders_cloneId);t.find("thead:gt(0), tr.sticky-false").hide();t.find("tbody, tfoot").remove();t.find("caption").toggle(b.stickyHeaders_includeCaption); y=E.children().children();t.css({height:0,width:0,margin:0});y.find("."+e.css.resizer).remove();c.addClass("hasStickyHeaders").bind(h.trim("pagerComplete"+k),function(){D()});e.bindEvents(d,E.children().children(".tablesorter-header"));c.after(z);a.onRenderHeader&&E.children("tr").children().each(function(b){a.onRenderHeader.apply(h(this),[b,a,t])});m.add(g).unbind(h.trim(["scroll","resize",""].join(k))).bind(h.trim(["scroll","resize",""].join(k)),function(a){if(c.is(":visible")){u=x.length?x.offset().top- g.scrollTop()+x.height():0;var b=c.offset(),d=h.isWindow(g[0]),e=h.isWindow(m[0]),k=(f.length?d?g.scrollTop():g.offset().top:g.scrollTop())+w+u,l=c.height()-(z.height()+(r.height()||0)),b=k>b.top&&k<b.top+l?"visible":"hidden",l={visibility:b};f.length&&(l.top=d?k:f.scrollTop());e&&(l.left=c.offset().left-parseInt(c.css("margin-left"),10)-m.scrollLeft()-C);x.length&&(l.top=(l.top||0)+w+u);z.removeClass("tablesorter-sticky-visible tablesorter-sticky-hidden").addClass("tablesorter-sticky-"+b).css(l); if(b!==B||"resize"===a.type)D(),B=b}});b.stickyHeaders_addResizeEvent&&e.addHeaderResizeEvent(d);c.hasClass("hasFilters")&&b.filter_columnFilters&&(c.bind(h.trim("filterEnd"+k),function(){var d=h(document.activeElement).closest("td"),d=d.parent().children().index(d);z.hasClass(e.css.stickyVis)&&b.stickyHeaders_filteredToTop&&(A.scrollTo(0,c.position().top),0<=d&&a.$filters&&a.$filters.eq(d).find("a, select, input").filter(":visible").focus())}),e.filter.bindSearch(c,y.find("."+e.css.filter)),b.filter_hideFilters&& e.filter.hideFilters(t,a));c.trigger("stickyHeadersInit")}},remove:function(d,a,b){var c=a.namespace+"stickyheaders ";a.$table.removeClass("hasStickyHeaders").unbind(h.trim(["pagerComplete","filterEnd",""].join(c))).next("."+e.css.stickyWrap).remove();b.$sticky&&b.$sticky.length&&b.$sticky.remove();h(A).add(b.stickyHeaders_xScroll).add(b.stickyHeaders_yScroll).add(b.stickyHeaders_attachTo).unbind(h.trim(["scroll","resize",""].join(c)));e.addHeaderResizeEvent(d,!1)}});e.addWidget({id:"resizable",priority:40, options:{resizable:!0,resizable_addLastColumn:!1,resizable_widths:[],resizable_throttle:!1},format:function(d,a,b){if(!a.$table.hasClass("hasResizable")){a.$table.addClass("hasResizable");e.resizableReset(d,!0);var c,f,k,g,m,n={},r=a.$table,p=r.parent(),w="auto"===r.parent().css("overflow"),x=0,u=null,t=null,z=20>Math.abs(r.parent().width()-r.width()),E=function(a){if(0!==x&&u){var b=a.pageX-x,c=u.width();u.width(c+b);u.width()!==c&&z?t.width(t.width()-b):w&&(r.width(function(a,c){return c+b}),t.length|| (p[0].scrollLeft=r.width()));x=a.pageX}},y=function(){e.storage&&u&&t&&(n={},n[u.index()]=u.width(),n[t.index()]=t.width(),u.width(n[u.index()]),t.width(n[t.index()]),!1!==b.resizable&&e.storage(d,"tablesorter-resizable",a.$headers.map(function(){return h(this).width()}).get()));x=0;u=t=null;h(A).trigger("resize")};if(n=e.storage&&!1!==b.resizable?e.storage(d,"tablesorter-resizable"):{})for(g in n)!isNaN(g)&&g<a.$headers.length&&a.$headers.eq(g).width(n[g]);c=r.children("thead:first").children("tr"); c.children().each(function(){var b;b=h(this);g=b.attr("data-column");b="false"===e.getData(b,e.getColumnData(d,a.headers,g),"resizable");c.children().filter('[data-column="'+g+'"]')[b?"addClass":"removeClass"]("resizable-false")});c.each(function(){k=h(this).children().not(".resizable-false");h(this).find("."+e.css.wrapper).length||k.wrapInner('<div class="'+e.css.wrapper+'" style="position:relative;height:100%;width:100%"></div>');b.resizable_addLastColumn||(k=k.slice(0,-1));f=f?f.add(k):k});f.each(function(){var a= h(this),b=parseInt(a.css("padding-right"),10)+10;a.find("."+e.css.wrapper).append('<div class="'+e.css.resizer+'" style="cursor:w-resize;position:absolute;z-index:1;right:-'+b+'px;top:0;height:100%;width:20px;"></div>')}).find("."+e.css.resizer).bind("mousedown",function(b){u=h(b.target).closest("th");var c=a.$headers.filter('[data-column="'+u.attr("data-column")+'"]');1<c.length&&(u=u.add(c));t=b.shiftKey?u.parent().find("th").not(".resizable-false").filter(":last"):u.nextAll(":not(.resizable-false)").eq(0); x=b.pageX});h(document).bind("mousemove.tsresize",function(a){0!==x&&u&&(b.resizable_throttle?(clearTimeout(m),m=setTimeout(function(){E(a)},isNaN(b.resizable_throttle)?5:b.resizable_throttle)):E(a))}).bind("mouseup.tsresize",function(){y()});r.find("thead:first").bind("contextmenu.tsresize",function(){e.resizableReset(d);var a=h.isEmptyObject?h.isEmptyObject(n):!0;n={};return a})}},remove:function(d,a){a.$table.removeClass("hasResizable").children("thead").unbind("mouseup.tsresize mouseleave.tsresize contextmenu.tsresize").children("tr").children().unbind("mousemove.tsresize mouseup.tsresize").find("."+ e.css.resizer).remove();e.resizableReset(d)}});e.resizableReset=function(d,a){h(d).each(function(){var b,c=this.config,f=c&&c.widgetOptions;d&&c&&(c.$headers.each(function(a){b=h(this);f.resizable_widths&&f.resizable_widths[a]?b.css("width",f.resizable_widths[a]):b.hasClass("resizable-false")||b.css("width","")}),e.storage&&!a&&e.storage(this,"tablesorter-resizable",{}))})};e.addWidget({id:"saveSort",priority:20,options:{saveSort:!0},init:function(d,a,b,c){a.format(d,b,c,!0)},format:function(d,a, b,c){var f,k=a.$table;b=!1!==b.saveSort;var g={sortList:a.sortList};a.debug&&(f=new Date);k.hasClass("hasSaveSort")?b&&d.hasInitialized&&e.storage&&(e.storage(d,"tablesorter-savesort",g),a.debug&&e.benchmark("saveSort widget: Saving last sort: "+a.sortList,f)):(k.addClass("hasSaveSort"),g="",e.storage&&(g=(b=e.storage(d,"tablesorter-savesort"))&&b.hasOwnProperty("sortList")&&h.isArray(b.sortList)?b.sortList:"",a.debug&&e.benchmark('saveSort: Last sort loaded: "'+g+'"',f),k.bind("saveSortReset",function(a){a.stopPropagation(); e.storage(d,"tablesorter-savesort","")})),c&&g&&0<g.length?a.sortList=g:d.hasInitialized&&g&&0<g.length&&k.trigger("sorton",[g]))},remove:function(d,a){a.$table.removeClass("hasSaveSort");e.storage&&e.storage(d,"tablesorter-savesort","")}})})(jQuery,window);
diff --git a/js/widgets/widget-columns.js b/js/widgets/widget-columns.js
new file mode 100644
index 00000000..e37751bf
--- /dev/null
+++ b/js/widgets/widget-columns.js
@@ -0,0 +1,78 @@
+/*! Widget: columns */
+;(function ($) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+ts.addWidget({
+	id: "columns",
+	priority: 30,
+	options : {
+		columns : [ "primary", "secondary", "tertiary" ]
+	},
+	format: function(table, c, wo) {
+		var $tbody, tbodyIndex, $rows, rows, $row, $cells, remove, indx,
+			$table = c.$table,
+			$tbodies = c.$tbodies,
+			sortList = c.sortList,
+			len = sortList.length,
+			// removed c.widgetColumns support
+			css = wo && wo.columns || [ "primary", "secondary", "tertiary" ],
+			last = css.length - 1;
+			remove = css.join(' ');
+		// check if there is a sort (on initialization there may not be one)
+		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
+			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true); // detach tbody
+			$rows = $tbody.children('tr');
+			// loop through the visible rows
+			$rows.each(function() {
+				$row = $(this);
+				if (this.style.display !== 'none') {
+					// remove all columns class names
+					$cells = $row.children().removeClass(remove);
+					// add appropriate column class names
+					if (sortList && sortList[0]) {
+						// primary sort column class
+						$cells.eq(sortList[0][0]).addClass(css[0]);
+						if (len > 1) {
+							for (indx = 1; indx < len; indx++) {
+								// secondary, tertiary, etc sort column classes
+								$cells.eq(sortList[indx][0]).addClass( css[indx] || css[last] );
+							}
+						}
+					}
+				}
+			});
+			ts.processTbody(table, $tbody, false);
+		}
+		// add classes to thead and tfoot
+		rows = wo.columns_thead !== false ? ['thead tr'] : [];
+		if (wo.columns_tfoot !== false) {
+			rows.push('tfoot tr');
+		}
+		if (rows.length) {
+			$rows = $table.find( rows.join(',') ).children().removeClass(remove);
+			if (len) {
+				for (indx = 0; indx < len; indx++) {
+					// add primary. secondary, tertiary, etc sort column classes
+					$rows.filter('[data-column="' + sortList[indx][0] + '"]').addClass(css[indx] || css[last]);
+				}
+			}
+		}
+	},
+	remove: function(table, c, wo) {
+		var tbodyIndex, $tbody,
+			$tbodies = c.$tbodies,
+			remove = (wo.columns || [ "primary", "secondary", "tertiary" ]).join(' ');
+		c.$headers.removeClass(remove);
+		c.$table.children('tfoot').children('tr').children('th, td').removeClass(remove);
+		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
+			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true); // remove tbody
+			$tbody.children('tr').each(function() {
+				$(this).children().removeClass(remove);
+			});
+			ts.processTbody(table, $tbody, false); // restore tbody
+		}
+	}
+});
+
+})(jQuery);
diff --git a/js/widgets/widget-filter-formatter-html5.js b/js/widgets/widget-filter-formatter-html5.js
new file mode 100644
index 00000000..d72a9692
--- /dev/null
+++ b/js/widgets/widget-filter-formatter-html5.js
@@ -0,0 +1,429 @@
+/*! Filter widget formatter html5 functions *//* updated 7/17/2014 (v2.17.5)
+ * requires: tableSorter (FORK) 2.15+ and jQuery 1.4.3+
+ *
+ * html5Number (spinner)
+ * html5Range (slider)
+ * html5Color (color)
+ */
+/*jshint browser:true, jquery:true, unused:false */
+/*global jQuery: false */
+;(function($){
+"use strict";
+
+var ts = $.tablesorter || {},
+
+// compare option selector class name (jQuery selector)
+compareSelect = '.compare-select',
+
+
+tsff = ts.filterFormatter = {
+
+	addCompare: function($cell, indx, options){
+		if (options.compare && $.isArray(options.compare) && options.compare.length > 1) {
+			var opt = '',
+				compareSelectClass = [ compareSelect.slice(1), ' ' + compareSelect.slice(1), '' ],
+				txt = options.cellText ? '<label class="' + compareSelectClass.join('-label') + indx + '">' + options.cellText + '</label>' : '';
+			$.each(options.compare, function(i, c){
+				opt += '<option ' + (options.selected === i ? 'selected' : '') + '>' + c + '</option>';
+			});
+			$cell
+				.wrapInner('<div class="' + compareSelectClass.join('-wrapper') + indx + '" />')
+				.prepend( txt + '<select class="' + compareSelectClass.join('') + indx + '" />' )
+				.find('select')
+				.append(opt);
+		}
+	},
+
+	updateCompare : function($cell, $input, o) {
+		var val = $input.val() || '',
+			num = val.replace(/\s*?[><=]\s*?/g, ''),
+			compare = val.match(/[><=]/g) || '';
+		if (o.compare) {
+			if ($.isArray(o.compare)){
+				compare = (compare || []).join('') || o.compare[o.selected || 0];
+			}
+			$cell.find(compareSelect).val( compare );
+		}
+		return [ val, num ];
+	},
+
+	/**********************\
+	HTML5 Number (spinner)
+	\**********************/
+	html5Number : function($cell, indx, def5Num) {
+		var t, o = $.extend({
+			value : 0,
+			min : 0,
+			max : 100,
+			step : 1,
+			delayed : true,
+			disabled : false,
+			addToggle : false,
+			exactMatch : false,
+			cellText : '',
+			compare : '',
+			skipTest: false
+		}, def5Num),
+
+		$input,
+		// test browser for HTML5 range support
+		$number = $('<input type="number" style="visibility:hidden;" value="test">').appendTo($cell),
+		// test if HTML5 number is supported - from Modernizr
+		numberSupported = o.skipTest || $number.attr('type') === 'number' && $number.val() !== 'test',
+		$shcell = [],
+		c = $cell.closest('table')[0].config,
+
+		updateNumber = function(delayed, notrigger){
+			var chkd = o.addToggle ? $cell.find('.toggle').is(':checked') : true,
+				v = $cell.find('.number').val(),
+				compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
+				searchType = c.$table[0].hasInitialized ? (delayed ? delayed : o.delayed) || '' : true;
+			$input
+				// add equal to the beginning, so we filter exact numbers
+				.val( !o.addToggle || chkd ? (compare ? compare : o.exactMatch ? '=' : '') + v : '' )
+				.trigger( notrigger ? '' : 'search', searchType ).end()
+				.find('.number').val(v);
+			if ($cell.find('.number').length) {
+				$cell.find('.number')[0].disabled = (o.disabled || !chkd);
+			}
+			// update sticky header cell
+			if ($shcell.length) {
+				$shcell.find('.number').val(v)[0].disabled = (o.disabled || !chkd);
+				$shcell.find(compareSelect).val(compare);
+				if (o.addToggle) {
+					$shcell.find('.toggle')[0].checked = chkd;
+				}
+			}
+		};
+		$number.remove();
+
+		if (numberSupported) {
+			t = o.addToggle ? '<div class="button"><input id="html5button' + indx + '" type="checkbox" class="toggle" />' +
+				'<label for="html5button' + indx + '"></label></div>' : '';
+			t += '<input class="number" type="number" min="' + o.min + '" max="' + o.max + '" value="' +
+				o.value + '" step="' + o.step + '" />';
+			// add HTML5 number (spinner)
+			$cell
+				.append(t + '<input type="hidden" />')
+				.find('.toggle, .number').bind('change', function(){
+					updateNumber();
+				})
+				.closest('thead').find('th[data-column=' + indx + ']')
+				.addClass('filter-parsed') // get exact numbers from column
+				// on reset
+				.closest('table').bind('filterReset', function(){
+					if ($.isArray(o.compare)) {
+						$cell.add($shcell).find(compareSelect).val( o.compare[ o.selected || 0 ] );
+					}
+					// turn off the toggle checkbox
+					if (o.addToggle) {
+						$cell.find('.toggle')[0].checked = false;
+						if ($shcell.length) {
+							$shcell.find('.toggle')[0].checked = false;
+						}
+					}
+					$cell.find('.number').val( o.value );
+					setTimeout(function(){
+						updateNumber();
+					}, 0);
+				});
+			$input = $cell.find('input[type=hidden]').bind('change', function(){
+				$cell.find('.number').val( this.value );
+				updateNumber();
+			});
+
+			// update slider from hidden input, in case of saved filters
+			c.$table.bind('filterFomatterUpdate', function(){
+				var val = tsff.updateCompare($cell, $input, o)[0] || o.value;
+				$cell.find('.number').val( ((val || '') + '').replace(/[><=]/g,'') );
+				updateNumber(false, true);
+				ts.filter.formatterUpdated($cell, indx);
+			});
+
+			if (o.compare) {
+				// add compare select
+				tsff.addCompare($cell, indx, o);
+				$cell.find(compareSelect).bind('change', function(){
+					updateNumber();
+				});
+			}
+
+			// has sticky headers?
+			c.$table.bind('stickyHeadersInit', function(){
+				$shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty();
+				$shcell
+					.append(t)
+					.find('.toggle, .number').bind('change', function(){
+						$cell.find('.number').val( $(this).val() );
+						updateNumber();
+					});
+
+				if (o.compare) {
+					// add compare select
+					tsff.addCompare($shcell, indx, o);
+					$shcell.find(compareSelect).bind('change', function(){
+						$cell.find(compareSelect).val( $(this).val() );
+						updateNumber();
+					});
+				}
+
+				updateNumber();
+			});
+
+			updateNumber();
+
+		}
+
+		return numberSupported ? $cell.find('input[type="hidden"]') : $('<input type="search">');
+	},
+
+	/**********************\
+	HTML5 range slider
+	\**********************/
+	html5Range : function($cell, indx, def5Range) {
+		var o = $.extend({
+			value : 0,
+			min : 0,
+			max : 100,
+			step : 1,
+			delayed : true,
+			valueToHeader : true,
+			exactMatch : true,
+			cellText : '',
+			compare : '',
+			allText : 'all',
+			skipTest : false
+		}, def5Range),
+
+		$input,
+		// test browser for HTML5 range support
+		$range = $('<input type="range" style="visibility:hidden;" value="test">').appendTo($cell),
+		// test if HTML5 range is supported - from Modernizr (but I left out the method to detect in Safari 2-4)
+		// see https://github.com/Modernizr/Modernizr/blob/master/feature-detects/inputtypes.js
+		rangeSupported = o.skipTest || $range.attr('type') === 'range' && $range.val() !== 'test',
+		$shcell = [],
+		c = $cell.closest('table')[0].config,
+
+		updateRange = function(v, delayed, notrigger){
+			/*jshint eqeqeq:false */
+			// hidden input changes may include compare symbols
+			v = ( typeof v === "undefined" ? $input.val() : v ).toString().replace(/[<>=]/g,'') || o.value;
+			var compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
+				t = ' (' + (compare ? compare + v : v == o.min ? o.allText : v) + ')',
+				searchType =  c.$table[0].hasInitialized ? (delayed ? delayed : o.delayed) || '' : true;
+			$cell.find('input[type=hidden]')
+				// add equal to the beginning, so we filter exact numbers
+				.val( ( compare ? compare + v : ( v == o.min ? '' : ( o.exactMatch ? '=' : '' ) + v ) ) )
+				//( val == o.min ? '' : val + (o.exactMatch ? '=' : ''))
+				.trigger( notrigger ? '' : 'search', searchType ).end()
+				.find('.range').val(v);
+			// or add current value to the header cell, if desired
+			$cell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(t);
+			// update sticky header cell
+			if ($shcell.length) {
+				$shcell
+					.find('.range').val(v).end()
+					.find(compareSelect).val( compare );
+				$shcell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(t);
+			}
+		};
+		$range.remove();
+
+		if (rangeSupported) {
+			// add HTML5 range
+			$cell
+				.html('<input type="hidden"><input class="range" type="range" min="' + o.min + '" max="' + o.max + '" value="' + o.value + '" />')
+				.closest('thead').find('th[data-column=' + indx + ']')
+				.addClass('filter-parsed') // get exact numbers from column
+				// add span to header for the current slider value
+				.find('.tablesorter-header-inner').append('<span class="curvalue" />');
+			// hidden filter update namespace trigger by filter widget
+			$input = $cell.find('input[type=hidden]').bind('change' + c.namespace + 'filter', function(){
+				/*jshint eqeqeq:false */
+				var v = this.value,
+					compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '';
+				if (v !== this.lastValue) {
+					this.lastValue = ( compare ? compare + v : ( v == o.min ? '' : ( o.exactMatch ? '=' : '' ) + v ) );
+					this.value = this.lastValue;
+					updateRange( v );
+				}
+			});
+
+			$cell.find('.range').bind('change', function(){
+				updateRange( this.value );
+			});
+
+			// update spinner from hidden input, in case of saved filters
+			c.$table.bind('filterFomatterUpdate', function(){
+				var val = tsff.updateCompare($cell, $input, o)[0];
+				$cell.find('.range').val( val );
+				updateRange(val, false, true);
+				ts.filter.formatterUpdated($cell, indx);
+			});
+
+			if (o.compare) {
+				// add compare select
+				tsff.addCompare($cell, indx, o);
+				$cell.find(compareSelect).bind('change', function(){
+					updateRange();
+				});
+			}
+
+			// has sticky headers?
+			c.$table.bind('stickyHeadersInit', function(){
+				$shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty();
+				$shcell
+					.html('<input class="range" type="range" min="' + o.min + '" max="' + o.max + '" value="' + o.value + '" />')
+					.find('.range').bind('change', function(){
+						updateRange( $shcell.find('.range').val() );
+					});
+				updateRange();
+
+				if (o.compare) {
+					// add compare select
+					tsff.addCompare($shcell, indx, o);
+					$shcell.find(compareSelect).bind('change', function(){
+						$cell.find(compareSelect).val( $(this).val() );
+						updateRange();
+					});
+				}
+
+			});
+
+			// on reset
+			$cell.closest('table').bind('filterReset', function(){
+				if ($.isArray(o.compare)) {
+					$cell.add($shcell).find(compareSelect).val( o.compare[ o.selected || 0 ] );
+				}
+				setTimeout(function(){
+					updateRange(o.value, false, true);
+				}, 0);
+			});
+			updateRange();
+
+		}
+
+		return rangeSupported ? $cell.find('input[type="hidden"]') : $('<input type="search">');
+	},
+
+	/**********************\
+	HTML5 Color picker
+	\**********************/
+	html5Color: function($cell, indx, defColor) {
+		var t, o = $.extend({
+			value : '#000000',
+			disabled : false,
+			addToggle : true,
+			exactMatch : true,
+			valueToHeader : false,
+			skipTest : false
+		}, defColor),
+		$input,
+		// Add a hidden input to hold the range values
+		$color = $('<input type="color" style="visibility:hidden;" value="test">').appendTo($cell),
+		// test if HTML5 color is supported - from Modernizr
+		colorSupported = o.skipTest || $color.attr('type') === 'color' && $color.val() !== 'test',
+		$shcell = [],
+		c = $cell.closest('table')[0].config,
+
+		updateColor = function(v, notrigger){
+			v = ( typeof v === "undefined" ? $input.val() : v ).toString().replace('=','') || o.value;
+			var chkd = true,
+				t = ' (' + v + ')';
+			if (o.addToggle) {
+				chkd = $cell.find('.toggle').is(':checked');
+			}
+			if ($cell.find('.colorpicker').length) {
+				$cell.find('.colorpicker').val(v)[0].disabled = (o.disabled || !chkd);
+			}
+
+			$input
+				.val( chkd ? v + (o.exactMatch ? '=' : '') : '' )
+				.trigger( !c.$table[0].hasInitialized || notrigger ? '' : 'search' );
+			if (o.valueToHeader) {
+				// add current color to the header cell
+				$cell.closest('thead').find('th[data-column=' + indx + ']').find('.curcolor').html(t);
+			} else {
+				// current color to span in cell
+				$cell.find('.currentColor').html(t);
+			}
+
+			// update sticky header cell
+			if ($shcell.length) {
+				$shcell.find('.colorpicker').val(v)[0].disabled = (o.disabled || !chkd);
+				if (o.addToggle) {
+					$shcell.find('.toggle')[0].checked = chkd;
+				}
+				if (o.valueToHeader) {
+					// add current color to the header cell
+					$shcell.closest('thead').find('th[data-column=' + indx + ']').find('.curcolor').html(t);
+				} else {
+					// current color to span in cell
+					$shcell.find('.currentColor').html(t);
+				}
+			}
+		};
+		$color.remove();
+
+		if (colorSupported) {
+			t = '' + indx + Math.round(Math.random() * 100);
+			// add HTML5 color picker
+			t = '<div class="color-controls-wrapper">' +
+				(o.addToggle ? '<div class="button"><input id="colorbutton' + t + '" type="checkbox" class="toggle" /><label for="colorbutton' +
+				t + '"></label></div>' : '') +
+				'<input type="hidden"><input class="colorpicker" type="color" />' +
+				(o.valueToHeader ? '' : '<span class="currentColor">(#000000)</span>') + '</div>';
+			$cell.html(t);
+			// add span to header for the current color value - only works if the line in the updateColor() function is also un-commented out
+			if (o.valueToHeader) {
+				$cell.closest('thead').find('th[data-column=' + indx + ']').find('.tablesorter-header-inner').append('<span class="curcolor" />');
+			}
+
+			$cell.find('.toggle, .colorpicker').bind('change', function(){
+				updateColor( $cell.find('.colorpicker').val() );
+			});
+
+			// hidden filter update namespace trigger by filter widget
+			$input = $cell.find('input[type=hidden]').bind('change' + c.namespace + 'filter', function(){
+				updateColor( this.value );
+			});
+
+			// update slider from hidden input, in case of saved filters
+			c.$table.bind('filterFomatterUpdate', function(){
+				updateColor( $input.val(), true );
+				ts.filter.formatterUpdated($cell, indx);
+			});
+
+			// on reset
+			$cell.closest('table').bind('filterReset', function(){
+				// just turn off the colorpicker
+				if (o.addToggle) {
+					$cell.find('.toggle')[0].checked = false;
+				}
+				// delay needed because default color needs to be set in the filter
+				// there is no compare option here, so if addToggle = false,
+				// default color is #000000 (even with no value set)
+				setTimeout(function(){
+					updateColor();
+				}, 0);
+			});
+
+			// has sticky headers?
+			c.$table.bind('stickyHeadersInit', function(){
+				$shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx);
+				$shcell
+					.html(t)
+					.find('.toggle, .colorpicker').bind('change', function(){
+						updateColor( $shcell.find('.colorpicker').val() );
+					});
+				updateColor( $shcell.find('.colorpicker').val() );
+			});
+
+			updateColor( o.value );
+		}
+		return colorSupported ? $cell.find('input[type="hidden"]') : $('<input type="search">');
+	}
+
+};
+
+})(jQuery);
diff --git a/js/jquery.tablesorter.widgets-filter-formatter.js b/js/widgets/widget-filter-formatter-jui.js
similarity index 65%
rename from js/jquery.tablesorter.widgets-filter-formatter.js
rename to js/widgets/widget-filter-formatter-jui.js
index 77050cd8..4c30caad 100644
--- a/js/jquery.tablesorter.widgets-filter-formatter.js
+++ b/js/widgets/widget-filter-formatter-jui.js
@@ -1,4 +1,4 @@
-/*! Filter widget formatter functions - updated 7/17/2014 (v2.17.5)
+/*! Filter widget formatter jQuery UI functions *//* updated 7/17/2014 (v2.17.5)
  * requires: tableSorter (FORK) 2.15+ and jQuery 1.4.3+
  *
  * uiSpinner (jQuery UI spinner)
@@ -6,9 +6,6 @@
  * uiRange (jQuery UI range slider)
  * uiDateCompare (jQuery UI datepicker; 1 input)
  * uiDatepicker (jQuery UI datepicker; 2 inputs, filter range)
- * html5Number (spinner)
- * html5Range (slider)
- * html5Color (color)
  */
 /*jshint browser:true, jquery:true, unused:false */
 /*global jQuery: false */
@@ -761,383 +758,6 @@ tsff = ts.filterFormatter = {
 
 		// return the hidden input so the filter widget has a reference to it
 		return $input.val( o.from ? ( o.to ? o.from + ' - ' + o.to : '>=' + o.from ) : (o.to ? '<=' + o.to : '') );
-	},
-
-	/**********************\
-	HTML5 Number (spinner)
-	\**********************/
-	html5Number : function($cell, indx, def5Num) {
-		var t, o = $.extend({
-			value : 0,
-			min : 0,
-			max : 100,
-			step : 1,
-			delayed : true,
-			disabled : false,
-			addToggle : false,
-			exactMatch : false,
-			cellText : '',
-			compare : '',
-			skipTest: false
-		}, def5Num),
-
-		$input,
-		// test browser for HTML5 range support
-		$number = $('<input type="number" style="visibility:hidden;" value="test">').appendTo($cell),
-		// test if HTML5 number is supported - from Modernizr
-		numberSupported = o.skipTest || $number.attr('type') === 'number' && $number.val() !== 'test',
-		$shcell = [],
-		c = $cell.closest('table')[0].config,
-
-		updateNumber = function(delayed, notrigger){
-			var chkd = o.addToggle ? $cell.find('.toggle').is(':checked') : true,
-				v = $cell.find('.number').val(),
-				compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
-				searchType = c.$table[0].hasInitialized ? (delayed ? delayed : o.delayed) || '' : true;
-			$input
-				// add equal to the beginning, so we filter exact numbers
-				.val( !o.addToggle || chkd ? (compare ? compare : o.exactMatch ? '=' : '') + v : '' )
-				.trigger( notrigger ? '' : 'search', searchType ).end()
-				.find('.number').val(v);
-			if ($cell.find('.number').length) {
-				$cell.find('.number')[0].disabled = (o.disabled || !chkd);
-			}
-			// update sticky header cell
-			if ($shcell.length) {
-				$shcell.find('.number').val(v)[0].disabled = (o.disabled || !chkd);
-				$shcell.find(compareSelect).val(compare);
-				if (o.addToggle) {
-					$shcell.find('.toggle')[0].checked = chkd;
-				}
-			}
-		};
-		$number.remove();
-
-		if (numberSupported) {
-			t = o.addToggle ? '<div class="button"><input id="html5button' + indx + '" type="checkbox" class="toggle" />' +
-				'<label for="html5button' + indx + '"></label></div>' : '';
-			t += '<input class="number" type="number" min="' + o.min + '" max="' + o.max + '" value="' +
-				o.value + '" step="' + o.step + '" />';
-			// add HTML5 number (spinner)
-			$cell
-				.append(t + '<input type="hidden" />')
-				.find('.toggle, .number').bind('change', function(){
-					updateNumber();
-				})
-				.closest('thead').find('th[data-column=' + indx + ']')
-				.addClass('filter-parsed') // get exact numbers from column
-				// on reset
-				.closest('table').bind('filterReset', function(){
-					if ($.isArray(o.compare)) {
-						$cell.add($shcell).find(compareSelect).val( o.compare[ o.selected || 0 ] );
-					}
-					// turn off the toggle checkbox
-					if (o.addToggle) {
-						$cell.find('.toggle')[0].checked = false;
-						if ($shcell.length) {
-							$shcell.find('.toggle')[0].checked = false;
-						}
-					}
-					$cell.find('.number').val( o.value );
-					setTimeout(function(){
-						updateNumber();
-					}, 0);
-				});
-			$input = $cell.find('input[type=hidden]').bind('change', function(){
-				$cell.find('.number').val( this.value );
-				updateNumber();
-			});
-
-			// update slider from hidden input, in case of saved filters
-			c.$table.bind('filterFomatterUpdate', function(){
-				var val = tsff.updateCompare($cell, $input, o)[0] || o.value;
-				$cell.find('.number').val( ((val || '') + '').replace(/[><=]/g,'') );
-				updateNumber(false, true);
-				ts.filter.formatterUpdated($cell, indx);
-			});
-
-			if (o.compare) {
-				// add compare select
-				tsff.addCompare($cell, indx, o);
-				$cell.find(compareSelect).bind('change', function(){
-					updateNumber();
-				});
-			}
-
-			// has sticky headers?
-			c.$table.bind('stickyHeadersInit', function(){
-				$shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty();
-				$shcell
-					.append(t)
-					.find('.toggle, .number').bind('change', function(){
-						$cell.find('.number').val( $(this).val() );
-						updateNumber();
-					});
-
-				if (o.compare) {
-					// add compare select
-					tsff.addCompare($shcell, indx, o);
-					$shcell.find(compareSelect).bind('change', function(){
-						$cell.find(compareSelect).val( $(this).val() );
-						updateNumber();
-					});
-				}
-
-				updateNumber();
-			});
-
-			updateNumber();
-
-		}
-
-		return numberSupported ? $cell.find('input[type="hidden"]') : $('<input type="search">');
-	},
-
-	/**********************\
-	HTML5 range slider
-	\**********************/
-	html5Range : function($cell, indx, def5Range) {
-		var o = $.extend({
-			value : 0,
-			min : 0,
-			max : 100,
-			step : 1,
-			delayed : true,
-			valueToHeader : true,
-			exactMatch : true,
-			cellText : '',
-			compare : '',
-			allText : 'all',
-			skipTest : false
-		}, def5Range),
-
-		$input,
-		// test browser for HTML5 range support
-		$range = $('<input type="range" style="visibility:hidden;" value="test">').appendTo($cell),
-		// test if HTML5 range is supported - from Modernizr (but I left out the method to detect in Safari 2-4)
-		// see https://github.com/Modernizr/Modernizr/blob/master/feature-detects/inputtypes.js
-		rangeSupported = o.skipTest || $range.attr('type') === 'range' && $range.val() !== 'test',
-		$shcell = [],
-		c = $cell.closest('table')[0].config,
-
-		updateRange = function(v, delayed, notrigger){
-			/*jshint eqeqeq:false */
-			// hidden input changes may include compare symbols
-			v = ( typeof v === "undefined" ? $input.val() : v ).toString().replace(/[<>=]/g,'') || o.value;
-			var compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '',
-				t = ' (' + (compare ? compare + v : v == o.min ? o.allText : v) + ')',
-				searchType =  c.$table[0].hasInitialized ? (delayed ? delayed : o.delayed) || '' : true;
-			$cell.find('input[type=hidden]')
-				// add equal to the beginning, so we filter exact numbers
-				.val( ( compare ? compare + v : ( v == o.min ? '' : ( o.exactMatch ? '=' : '' ) + v ) ) )
-				//( val == o.min ? '' : val + (o.exactMatch ? '=' : ''))
-				.trigger( notrigger ? '' : 'search', searchType ).end()
-				.find('.range').val(v);
-			// or add current value to the header cell, if desired
-			$cell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(t);
-			// update sticky header cell
-			if ($shcell.length) {
-				$shcell
-					.find('.range').val(v).end()
-					.find(compareSelect).val( compare );
-				$shcell.closest('thead').find('th[data-column=' + indx + ']').find('.curvalue').html(t);
-			}
-		};
-		$range.remove();
-
-		if (rangeSupported) {
-			// add HTML5 range
-			$cell
-				.html('<input type="hidden"><input class="range" type="range" min="' + o.min + '" max="' + o.max + '" value="' + o.value + '" />')
-				.closest('thead').find('th[data-column=' + indx + ']')
-				.addClass('filter-parsed') // get exact numbers from column
-				// add span to header for the current slider value
-				.find('.tablesorter-header-inner').append('<span class="curvalue" />');
-			// hidden filter update namespace trigger by filter widget
-			$input = $cell.find('input[type=hidden]').bind('change' + c.namespace + 'filter', function(){
-				/*jshint eqeqeq:false */
-				var v = this.value,
-					compare = ($.isArray(o.compare) ? $cell.find(compareSelect).val() || o.compare[ o.selected || 0] : o.compare) || '';
-				if (v !== this.lastValue) {
-					this.lastValue = ( compare ? compare + v : ( v == o.min ? '' : ( o.exactMatch ? '=' : '' ) + v ) );
-					this.value = this.lastValue;
-					updateRange( v );
-				}
-			});
-
-			$cell.find('.range').bind('change', function(){
-				updateRange( this.value );
-			});
-
-			// update spinner from hidden input, in case of saved filters
-			c.$table.bind('filterFomatterUpdate', function(){
-				var val = tsff.updateCompare($cell, $input, o)[0];
-				$cell.find('.range').val( val );
-				updateRange(val, false, true);
-				ts.filter.formatterUpdated($cell, indx);
-			});
-
-			if (o.compare) {
-				// add compare select
-				tsff.addCompare($cell, indx, o);
-				$cell.find(compareSelect).bind('change', function(){
-					updateRange();
-				});
-			}
-
-			// has sticky headers?
-			c.$table.bind('stickyHeadersInit', function(){
-				$shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx).empty();
-				$shcell
-					.html('<input class="range" type="range" min="' + o.min + '" max="' + o.max + '" value="' + o.value + '" />')
-					.find('.range').bind('change', function(){
-						updateRange( $shcell.find('.range').val() );
-					});
-				updateRange();
-
-				if (o.compare) {
-					// add compare select
-					tsff.addCompare($shcell, indx, o);
-					$shcell.find(compareSelect).bind('change', function(){
-						$cell.find(compareSelect).val( $(this).val() );
-						updateRange();
-					});
-				}
-
-			});
-
-			// on reset
-			$cell.closest('table').bind('filterReset', function(){
-				if ($.isArray(o.compare)) {
-					$cell.add($shcell).find(compareSelect).val( o.compare[ o.selected || 0 ] );
-				}
-				setTimeout(function(){
-					updateRange(o.value, false, true);
-				}, 0);
-			});
-			updateRange();
-
-		}
-
-		return rangeSupported ? $cell.find('input[type="hidden"]') : $('<input type="search">');
-	},
-
-	/**********************\
-	HTML5 Color picker
-	\**********************/
-	html5Color: function($cell, indx, defColor) {
-		var t, o = $.extend({
-			value : '#000000',
-			disabled : false,
-			addToggle : true,
-			exactMatch : true,
-			valueToHeader : false,
-			skipTest : false
-		}, defColor),
-		$input,
-		// Add a hidden input to hold the range values
-		$color = $('<input type="color" style="visibility:hidden;" value="test">').appendTo($cell),
-		// test if HTML5 color is supported - from Modernizr
-		colorSupported = o.skipTest || $color.attr('type') === 'color' && $color.val() !== 'test',
-		$shcell = [],
-		c = $cell.closest('table')[0].config,
-
-		updateColor = function(v, notrigger){
-			v = ( typeof v === "undefined" ? $input.val() : v ).toString().replace('=','') || o.value;
-			var chkd = true,
-				t = ' (' + v + ')';
-			if (o.addToggle) {
-				chkd = $cell.find('.toggle').is(':checked');
-			}
-			if ($cell.find('.colorpicker').length) {
-				$cell.find('.colorpicker').val(v)[0].disabled = (o.disabled || !chkd);
-			}
-
-			$input
-				.val( chkd ? v + (o.exactMatch ? '=' : '') : '' )
-				.trigger( !c.$table[0].hasInitialized || notrigger ? '' : 'search' );
-			if (o.valueToHeader) {
-				// add current color to the header cell
-				$cell.closest('thead').find('th[data-column=' + indx + ']').find('.curcolor').html(t);
-			} else {
-				// current color to span in cell
-				$cell.find('.currentColor').html(t);
-			}
-
-			// update sticky header cell
-			if ($shcell.length) {
-				$shcell.find('.colorpicker').val(v)[0].disabled = (o.disabled || !chkd);
-				if (o.addToggle) {
-					$shcell.find('.toggle')[0].checked = chkd;
-				}
-				if (o.valueToHeader) {
-					// add current color to the header cell
-					$shcell.closest('thead').find('th[data-column=' + indx + ']').find('.curcolor').html(t);
-				} else {
-					// current color to span in cell
-					$shcell.find('.currentColor').html(t);
-				}
-			}
-		};
-		$color.remove();
-
-		if (colorSupported) {
-			t = '' + indx + Math.round(Math.random() * 100);
-			// add HTML5 color picker
-			t = '<div class="color-controls-wrapper">' +
-				(o.addToggle ? '<div class="button"><input id="colorbutton' + t + '" type="checkbox" class="toggle" /><label for="colorbutton' +
-				t + '"></label></div>' : '') +
-				'<input type="hidden"><input class="colorpicker" type="color" />' +
-				(o.valueToHeader ? '' : '<span class="currentColor">(#000000)</span>') + '</div>';
-			$cell.html(t);
-			// add span to header for the current color value - only works if the line in the updateColor() function is also un-commented out
-			if (o.valueToHeader) {
-				$cell.closest('thead').find('th[data-column=' + indx + ']').find('.tablesorter-header-inner').append('<span class="curcolor" />');
-			}
-
-			$cell.find('.toggle, .colorpicker').bind('change', function(){
-				updateColor( $cell.find('.colorpicker').val() );
-			});
-
-			// hidden filter update namespace trigger by filter widget
-			$input = $cell.find('input[type=hidden]').bind('change' + c.namespace + 'filter', function(){
-				updateColor( this.value );
-			});
-
-			// update slider from hidden input, in case of saved filters
-			c.$table.bind('filterFomatterUpdate', function(){
-				updateColor( $input.val(), true );
-				ts.filter.formatterUpdated($cell, indx);
-			});
-
-			// on reset
-			$cell.closest('table').bind('filterReset', function(){
-				// just turn off the colorpicker
-				if (o.addToggle) {
-					$cell.find('.toggle')[0].checked = false;
-				}
-				// delay needed because default color needs to be set in the filter
-				// there is no compare option here, so if addToggle = false,
-				// default color is #000000 (even with no value set)
-				setTimeout(function(){
-					updateColor();
-				}, 0);
-			});
-
-			// has sticky headers?
-			c.$table.bind('stickyHeadersInit', function(){
-				$shcell = c.widgetOptions.$sticky.find('.tablesorter-filter-row').children().eq(indx);
-				$shcell
-					.html(t)
-					.find('.toggle, .colorpicker').bind('change', function(){
-						updateColor( $shcell.find('.colorpicker').val() );
-					});
-				updateColor( $shcell.find('.colorpicker').val() );
-			});
-
-			updateColor( o.value );
-		}
-		return colorSupported ? $cell.find('input[type="hidden"]') : $('<input type="search">');
 	}
 
 };
diff --git a/js/jquery.tablesorter.widgets-filter-formatter-select2.js b/js/widgets/widget-filter-formatter-select2.js
similarity index 100%
rename from js/jquery.tablesorter.widgets-filter-formatter-select2.js
rename to js/widgets/widget-filter-formatter-select2.js
diff --git a/js/widgets/widget-filter.js b/js/widgets/widget-filter.js
new file mode 100644
index 00000000..b3f62e11
--- /dev/null
+++ b/js/widgets/widget-filter.js
@@ -0,0 +1,1281 @@
+/*! Widget: filter */
+;(function ($) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+$.extend(ts.css, {
+	filterRow : 'tablesorter-filter-row',
+	filter    : 'tablesorter-filter'
+});
+
+ts.addWidget({
+	id: "filter",
+	priority: 50,
+	options : {
+		filter_childRows     : false, // if true, filter includes child row content in the search
+		filter_columnFilters : true,  // if true, a filter will be added to the top of each table column
+		filter_cellFilter    : '',    // css class name added to the filter cell (string or array)
+		filter_cssFilter     : '',    // css class name added to the filter row & each input in the row (tablesorter-filter is ALWAYS added)
+		filter_defaultFilter : {},    // add a default column filter type "~{query}" to make fuzzy searches default; "{q1} AND {q2}" to make all searches use a logical AND.
+		filter_excludeFilter : {},    // filters to exclude, per column
+		filter_external      : '',    // jQuery selector string (or jQuery object) of external filters
+		filter_filteredRow   : 'filtered', // class added to filtered rows; needed by pager plugin
+		filter_formatter     : null,  // add custom filter elements to the filter row
+		filter_functions     : null,  // add custom filter functions using this option
+		filter_hideEmpty     : true,  // hide filter row when table is empty
+		filter_hideFilters   : false, // collapse filter row when mouse leaves the area
+		filter_ignoreCase    : true,  // if true, make all searches case-insensitive
+		filter_liveSearch    : true,  // if true, search column content while the user types (with a delay)
+		filter_onlyAvail     : 'filter-onlyAvail', // a header with a select dropdown & this class name will only show available (visible) options within the drop down
+		filter_placeholder   : { search : '', select : '' }, // default placeholder text (overridden by any header "data-placeholder" setting)
+		filter_reset         : null,  // jQuery selector string of an element used to reset the filters
+		filter_saveFilters   : false, // Use the $.tablesorter.storage utility to save the most recent filters
+		filter_searchDelay   : 300,   // typing delay in milliseconds before starting a search
+		filter_searchFiltered: true,  // allow searching through already filtered rows in special circumstances; will speed up searching in large tables if true
+		filter_selectSource  : null,  // include a function to return an array of values to be added to the column filter select
+		filter_startsWith    : false, // if true, filter start from the beginning of the cell contents
+		filter_useParsedData : false, // filter all data using parsed content
+		filter_serversideFiltering : false, // if true, server-side filtering should be performed because client-side filtering will be disabled, but the ui and events will still be used.
+		filter_defaultAttrib : 'data-value', // data attribute in the header cell that contains the default filter value
+		filter_selectSourceSeparator : '|' // filter_selectSource array text left of the separator is added to the option value, right into the option text
+	},
+	format: function(table, c, wo) {
+		if (!c.$table.hasClass('hasFilters')) {
+			ts.filter.init(table, c, wo);
+		}
+	},
+	remove: function(table, c, wo, refreshing) {
+		var tbodyIndex, $tbody,
+			$table = c.$table,
+			$tbodies = c.$tbodies,
+			events = 'addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search '.split(' ').join(c.namespace + 'filter ');
+		$table
+			.removeClass('hasFilters')
+			// add .tsfilter namespace to all BUT search
+			.unbind( $.trim(events) )
+			// remove the filter row even if refreshing, because the column might have been moved
+			.find('.' + ts.css.filterRow).remove();
+		if (refreshing) { return; }
+		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
+			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true); // remove tbody
+			$tbody.children().removeClass(wo.filter_filteredRow).show();
+			ts.processTbody(table, $tbody, false); // restore tbody
+		}
+		if (wo.filter_reset) {
+			$(document).undelegate(wo.filter_reset, 'click.tsfilter');
+		}
+	}
+});
+
+ts.filter = {
+
+	// regex used in filter "check" functions - not for general use and not documented
+	regex: {
+		regex     : /^\/((?:\\\/|[^\/])+)\/([mig]{0,3})?$/, // regex to test for regex
+		child     : /tablesorter-childRow/, // child row class name; this gets updated in the script
+		filtered  : /filtered/, // filtered (hidden) row class name; updated in the script
+		type      : /undefined|number/, // check type
+		exact     : /(^[\"\'=]+)|([\"\'=]+$)/g, // exact match (allow '==')
+		nondigit  : /[^\w,. \-()]/g, // replace non-digits (from digit & currency parser)
+		operators : /[<>=]/g, // replace operators
+		query     : '(q|query)' // replace filter queries
+	},
+		// function( c, data ) { }
+		// c = table.config
+		// data.filter = array of filter input values;
+		// data.iFilter = same array, except lowercase (if wo.filter_ignoreCase is true)
+		// data.exact = table cell text (or parsed data if column parser enabled)
+		// data.iExact = same as data.exact, except lowercase (if wo.filter_ignoreCase is true)
+		// data.cache = table cell text from cache, so it has been parsed (& in all lower case if config.ignoreCase is true)
+		// data.index = column index; table = table element (DOM)
+		// data.parsed = array (by column) of boolean values (from filter_useParsedData or "filter-parsed" class)
+	types: {
+		// Look for regex
+		regex: function( c, data ) {
+			if ( ts.filter.regex.regex.test(data.iFilter) ) {
+				var matches,
+					regex = ts.filter.regex.regex.exec(data.iFilter);
+				try {
+					matches = new RegExp(regex[1], regex[2]).test( data.iExact );
+				} catch (error) {
+					matches = false;
+				}
+				return matches;
+			}
+			return null;
+		},
+		// Look for operators >, >=, < or <=
+		operators: function( c, data ) {
+			if ( /^[<>]=?/.test(data.iFilter) ) {
+				var cachedValue, result,
+					table = c.table,
+					index = data.index,
+					parsed = data.parsed[index],
+					query = ts.formatFloat( data.iFilter.replace(ts.filter.regex.operators, ''), table ),
+					parser = c.parsers[index],
+					savedSearch = query;
+				// parse filter value in case we're comparing numbers (dates)
+				if (parsed || parser.type === 'numeric') {
+					result = ts.filter.parseFilter(c, $.trim('' + data.iFilter.replace(ts.filter.regex.operators, '')), index, parsed, true);
+					query = ( typeof result === "number" && result !== '' && !isNaN(result) ) ? result : query;
+				}
+
+				// iExact may be numeric - see issue #149;
+				// check if cached is defined, because sometimes j goes out of range? (numeric columns)
+				cachedValue = ( parsed || parser.type === 'numeric' ) && !isNaN(query) && typeof data.cache !== 'undefined' ? data.cache :
+					isNaN(data.iExact) ? ts.formatFloat( data.iExact.replace(ts.filter.regex.nondigit, ''), table) :
+					ts.formatFloat( data.iExact, table );
+
+				if ( />/.test(data.iFilter) ) { result = />=/.test(data.iFilter) ? cachedValue >= query : cachedValue > query; }
+				if ( /</.test(data.iFilter) ) { result = /<=/.test(data.iFilter) ? cachedValue <= query : cachedValue < query; }
+				// keep showing all rows if nothing follows the operator
+				if ( !result && savedSearch === '' ) { result = true; }
+				return result;
+			}
+			return null;
+		},
+		// Look for a not match
+		notMatch: function( c, data ) {
+			if ( /^\!/.test(data.iFilter) ) {
+				var indx,
+					filter = ts.filter.parseFilter(c, data.iFilter.replace('!', ''), data.index, data.parsed[data.index]);
+				if (ts.filter.regex.exact.test(filter)) {
+					// look for exact not matches - see #628
+					filter = filter.replace(ts.filter.regex.exact, '');
+					return filter === '' ? true : $.trim(filter) !== data.iExact;
+				} else {
+					indx = data.iExact.search( $.trim(filter) );
+					return filter === '' ? true : !(c.widgetOptions.filter_startsWith ? indx === 0 : indx >= 0);
+				}
+			}
+			return null;
+		},
+		// Look for quotes or equals to get an exact match; ignore type since iExact could be numeric
+		exact: function( c, data ) {
+			/*jshint eqeqeq:false */
+			if (ts.filter.regex.exact.test(data.iFilter)) {
+				var filter = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.exact, ''), data.index, data.parsed[data.index]);
+				return data.anyMatch ? $.inArray(filter, data.rowArray) >= 0 : filter == data.iExact;
+			}
+			return null;
+		},
+		// Look for an AND or && operator (logical and)
+		and : function( c, data ) {
+			if ( ts.filter.regex.andTest.test(data.filter) ) {
+				var index = data.index,
+					parsed = data.parsed[index],
+					query = data.iFilter.split( ts.filter.regex.andSplit ),
+					result = data.iExact.search( $.trim( ts.filter.parseFilter(c, query[0], index, parsed) ) ) >= 0,
+					indx = query.length - 1;
+				while (result && indx) {
+					result = result && data.iExact.search( $.trim( ts.filter.parseFilter(c, query[indx], index, parsed) ) ) >= 0;
+					indx--;
+				}
+				return result;
+			}
+			return null;
+		},
+		// Look for a range (using " to " or " - ") - see issue #166; thanks matzhu!
+		range : function( c, data ) {
+			if ( ts.filter.regex.toTest.test(data.iFilter) ) {
+				var result, tmp,
+					table = c.table,
+					index = data.index,
+					parsed = data.parsed[index],
+					// make sure the dash is for a range and not indicating a negative number
+					query = data.iFilter.split( ts.filter.regex.toSplit ),
+					range1 = ts.formatFloat( ts.filter.parseFilter(c, query[0].replace(ts.filter.regex.nondigit, ''), index, parsed), table ),
+					range2 = ts.formatFloat( ts.filter.parseFilter(c, query[1].replace(ts.filter.regex.nondigit, ''), index, parsed), table );
+					// parse filter value in case we're comparing numbers (dates)
+				if (parsed || c.parsers[index].type === 'numeric') {
+					result = c.parsers[index].format('' + query[0], table, c.$headers.eq(index), index);
+					range1 = (result !== '' && !isNaN(result)) ? result : range1;
+					result = c.parsers[index].format('' + query[1], table, c.$headers.eq(index), index);
+					range2 = (result !== '' && !isNaN(result)) ? result : range2;
+				}
+				result = ( parsed || c.parsers[index].type === 'numeric' ) && !isNaN(range1) && !isNaN(range2) ? data.cache :
+					isNaN(data.iExact) ? ts.formatFloat( data.iExact.replace(ts.filter.regex.nondigit, ''), table) :
+					ts.formatFloat( data.iExact, table );
+				if (range1 > range2) { tmp = range1; range1 = range2; range2 = tmp; } // swap
+				return (result >= range1 && result <= range2) || (range1 === '' || range2 === '');
+			}
+			return null;
+		},
+		// Look for wild card: ? = single, * = multiple, or | = logical OR
+		wild : function( c, data ) {
+			if ( /[\?\*\|]/.test(data.iFilter) || ts.filter.regex.orReplace.test(data.filter) ) {
+				var index = data.index,
+					parsed = data.parsed[index],
+					query = ts.filter.parseFilter(c, data.iFilter.replace(ts.filter.regex.orReplace, "|"), index, parsed);
+				// look for an exact match with the "or" unless the "filter-match" class is found
+				if (!c.$headers.filter('[data-column="' + index + '"]:last').hasClass('filter-match') && /\|/.test(query)) {
+					// show all results while using filter match. Fixes #727
+					if (query[ query.length - 1 ] === '|') { query += '*'; }
+					query = data.anyMatch && $.isArray(data.rowArray) ? '(' + query + ')' : '^(' + query + ')$';
+				}
+				// parsing the filter may not work properly when using wildcards =/
+				return new RegExp( query.replace(/\?/g, '\\S{1}').replace(/\*/g, '\\S*') ).test(data.iExact);
+			}
+			return null;
+		},
+		// fuzzy text search; modified from https://github.com/mattyork/fuzzy (MIT license)
+		fuzzy: function( c, data ) {
+			if ( /^~/.test(data.iFilter) ) {
+				var indx,
+					patternIndx = 0,
+					len = data.iExact.length,
+					pattern = ts.filter.parseFilter(c, data.iFilter.slice(1), data.index, data.parsed[data.index]);
+				for (indx = 0; indx < len; indx++) {
+					if (data.iExact[indx] === pattern[patternIndx]) {
+						patternIndx += 1;
+					}
+				}
+				if (patternIndx === pattern.length) {
+					return true;
+				}
+				return false;
+			}
+			return null;
+		}
+	},
+	init: function(table, c, wo) {
+		// filter language options
+		ts.language = $.extend(true, {}, {
+			to  : 'to',
+			or  : 'or',
+			and : 'and'
+		}, ts.language);
+
+		var options, string, txt, $header, column, filters, val, fxn, noSelect,
+			regex = ts.filter.regex;
+		c.$table.addClass('hasFilters');
+
+		// define timers so using clearTimeout won't cause an undefined error
+		wo.searchTimer = null;
+		wo.filter_initTimer = null;
+		wo.filter_formatterCount = 0;
+		wo.filter_formatterInit = [];
+		wo.filter_anyColumnSelector = '[data-column="all"],[data-column="any"]';
+		wo.filter_multipleColumnSelector = '[data-column*="-"],[data-column*=","]';
+
+		txt = '\\{' + ts.filter.regex.query + '\\}';
+		$.extend( regex, {
+			child : new RegExp(c.cssChildRow),
+			filtered : new RegExp(wo.filter_filteredRow),
+			alreadyFiltered : new RegExp('(\\s+(' + ts.language.or + '|-|' + ts.language.to + ')\\s+)', 'i'),
+			toTest : new RegExp('\\s+(-|' + ts.language.to + ')\\s+', 'i'),
+			toSplit : new RegExp('(?:\\s+(?:-|' + ts.language.to + ')\\s+)' ,'gi'),
+			andTest : new RegExp('\\s+(' + ts.language.and + '|&&)\\s+', 'i'),
+			andSplit : new RegExp('(?:\\s+(?:' + ts.language.and + '|&&)\\s+)', 'gi'),
+			orReplace : new RegExp('\\s+(' + ts.language.or + ')\\s+', 'gi'),
+			iQuery : new RegExp(txt, 'i'),
+			igQuery : new RegExp(txt, 'ig')
+		});
+
+		// don't build filter row if columnFilters is false or all columns are set to "filter-false" - issue #156
+		if (wo.filter_columnFilters !== false && c.$headers.filter('.filter-false, .parser-false').length !== c.$headers.length) {
+			// build filter row
+			ts.filter.buildRow(table, c, wo);
+		}
+
+		txt = 'addRows updateCell update updateRows updateComplete appendCache filterReset filterEnd search '.split(' ').join(c.namespace + 'filter ');
+		c.$table.bind( $.trim(txt), function(event, filter) {
+			val = (wo.filter_hideEmpty && $.isEmptyObject(c.cache) && !(c.delayInit && event.type === 'appendCache'));
+			// hide filter row using the "filtered" class name
+			c.$table.find('.' + ts.css.filterRow).toggleClass(wo.filter_filteredRow, val ); // fixes #450
+			if ( !/(search|filter)/.test(event.type) ) {
+				event.stopPropagation();
+				ts.filter.buildDefault(table, true);
+			}
+			if (event.type === 'filterReset') {
+				c.$table.find('.' + ts.css.filter).add(wo.filter_$externalFilters).val('');
+				ts.filter.searching(table, []);
+			} else if (event.type === 'filterEnd') {
+				ts.filter.buildDefault(table, true);
+			} else {
+				// send false argument to force a new search; otherwise if the filter hasn't changed, it will return
+				filter = event.type === 'search' ? filter : event.type === 'updateComplete' ? c.$table.data('lastSearch') : '';
+				if (/(update|add)/.test(event.type) && event.type !== "updateComplete") {
+					// force a new search since content has changed
+					c.lastCombinedFilter = null;
+					c.lastSearch = [];
+				}
+				// pass true (skipFirst) to prevent the tablesorter.setFilters function from skipping the first input
+				// ensures all inputs are updated when a search is triggered on the table $('table').trigger('search', [...]);
+				ts.filter.searching(table, filter, true);
+			}
+			return false;
+		});
+
+		// reset button/link
+		if (wo.filter_reset) {
+			if (wo.filter_reset instanceof $) {
+				// reset contains a jQuery object, bind to it
+				wo.filter_reset.click(function(){
+					c.$table.trigger('filterReset');
+				});
+			} else if ($(wo.filter_reset).length) {
+				// reset is a jQuery selector, use event delegation
+				$(document)
+				.undelegate(wo.filter_reset, 'click.tsfilter')
+				.delegate(wo.filter_reset, 'click.tsfilter', function() {
+					// trigger a reset event, so other functions (filter_formatter) know when to reset
+					c.$table.trigger('filterReset');
+				});
+			}
+		}
+		if (wo.filter_functions) {
+			for (column = 0; column < c.columns; column++) {
+				fxn = ts.getColumnData( table, wo.filter_functions, column );
+				if (fxn) {
+					// remove "filter-select" from header otherwise the options added here are replaced with all options
+					$header = c.$headers.filter('[data-column="' + column + '"]:last').removeClass('filter-select');
+					// don't build select if "filter-false" or "parser-false" set
+					noSelect = !($header.hasClass('filter-false') || $header.hasClass('parser-false'));
+					options = '';
+					if ( fxn === true && noSelect ) {
+						ts.filter.buildSelect(table, column);
+					} else if ( typeof fxn === 'object' && noSelect ) {
+						// add custom drop down list
+						for (string in fxn) {
+							if (typeof string === 'string') {
+								options += options === '' ?
+									'<option value="">' + ($header.data('placeholder') || $header.attr('data-placeholder') || wo.filter_placeholder.select || '') + '</option>' : '';
+								val = string;
+								txt = string;
+								if (string.indexOf(wo.filter_selectSourceSeparator) >= 0) {
+									val = string.split(wo.filter_selectSourceSeparator);
+									txt = val[1];
+									val = val[0];
+								}
+								options += '<option ' + (txt === val ? '' : 'data-function-name="' + string + '" ') + 'value="' + val + '">' + txt + '</option>';
+							}
+						}
+						c.$table.find('thead').find('select.' + ts.css.filter + '[data-column="' + column + '"]').append(options);
+					}
+				}
+			}
+		}
+		// not really updating, but if the column has both the "filter-select" class & filter_functions set to true,
+		// it would append the same options twice.
+		ts.filter.buildDefault(table, true);
+
+		ts.filter.bindSearch( table, c.$table.find('.' + ts.css.filter), true );
+		if (wo.filter_external) {
+			ts.filter.bindSearch( table, wo.filter_external );
+		}
+
+		if (wo.filter_hideFilters) {
+			ts.filter.hideFilters(table, c);
+		}
+
+		// show processing icon
+		if (c.showProcessing) {
+			c.$table
+				.unbind( $.trim('filterStart filterEnd '.split(' ').join(c.namespace + 'filter ')) )
+				.bind( $.trim('filterStart filterEnd '.split(' ').join(c.namespace + 'filter ')), function(event, columns) {
+				// only add processing to certain columns to all columns
+				$header = (columns) ? c.$table.find('.' + ts.css.header).filter('[data-column]').filter(function() {
+					return columns[$(this).data('column')] !== '';
+				}) : '';
+				ts.isProcessing(table, event.type === 'filterStart', columns ? $header : '');
+			});
+		}
+
+		// set filtered rows count (intially unfiltered)
+		c.filteredRows = c.totalRows;
+
+		// add default values
+		c.$table
+		.unbind( $.trim('tablesorter-initialized pagerBeforeInitialized '.split(' ').join(c.namespace + 'filter ')) )
+		.bind( $.trim('tablesorter-initialized pagerBeforeInitialized '.split(' ').join(c.namespace + 'filter ')), function() {
+			// redefine "wo" as it does not update properly inside this callback
+			var wo = this.config.widgetOptions;
+			filters = ts.filter.setDefaults(table, c, wo) || [];
+			if (filters.length) {
+				// prevent delayInit from triggering a cache build if filters are empty
+				if ( !(c.delayInit && filters.join('') === '') ) {
+					ts.setFilters(table, filters, true);
+				}
+			}
+			c.$table.trigger('filterFomatterUpdate');
+			// trigger init after setTimeout to prevent multiple filterStart/End/Init triggers
+			setTimeout(function(){
+				if (!wo.filter_initialized) {
+					ts.filter.filterInitComplete(c);
+				}
+			}, 100);
+		});
+		// if filter widget is added after pager has initialized; then set filter init flag
+		if (c.pager && c.pager.initialized && !wo.filter_initialized) {
+			c.$table.trigger('filterFomatterUpdate');
+			setTimeout(function(){
+				ts.filter.filterInitComplete(c);
+			}, 100);
+		}
+	},
+	// $cell parameter, but not the config, is passed to the
+	// filter_formatters, so we have to work with it instead
+	formatterUpdated: function($cell, column) {
+		var wo = $cell.closest('table')[0].config.widgetOptions;
+		if (!wo.filter_initialized) {
+			// add updates by column since this function
+			// may be called numerous times before initialization
+			wo.filter_formatterInit[column] = 1;
+		}
+	},
+	filterInitComplete: function(c){
+		var wo = c.widgetOptions,
+			count = 0,
+			completed = function(){
+				wo.filter_initialized = true;
+				c.$table.trigger('filterInit', c);
+				ts.filter.findRows(c.table, c.$table.data('lastSearch') || []);
+			};
+		if ( $.isEmptyObject( wo.filter_formatter ) ) {
+			completed();
+		} else {
+			$.each( wo.filter_formatterInit, function(i, val) {
+				if (val === 1) {
+					count++;
+				}
+			});
+			clearTimeout(wo.filter_initTimer);
+			if (!wo.filter_initialized && count === wo.filter_formatterCount) {
+				// filter widget initialized
+				completed();
+			} else if (!wo.filter_initialized) {
+				// fall back in case a filter_formatter doesn't call
+				// $.tablesorter.filter.formatterUpdated($cell, column), and the count is off
+				wo.filter_initTimer = setTimeout(function(){
+					completed();
+				}, 500);
+			}
+		}
+	},
+
+	setDefaults: function(table, c, wo) {
+		var isArray, saved, indx,
+			// get current (default) filters
+			filters = ts.getFilters(table) || [];
+		if (wo.filter_saveFilters && ts.storage) {
+			saved = ts.storage( table, 'tablesorter-filters' ) || [];
+			isArray = $.isArray(saved);
+			// make sure we're not just getting an empty array
+			if ( !(isArray && saved.join('') === '' || !isArray) ) { filters = saved; }
+		}
+		// if no filters saved, then check default settings
+		if (filters.join('') === '') {
+			for (indx = 0; indx < c.columns; indx++) {
+				filters[indx] = c.$headers.filter('[data-column="' + indx + '"]:last').attr(wo.filter_defaultAttrib) || filters[indx];
+			}
+		}
+		c.$table.data('lastSearch', filters);
+		return filters;
+	},
+	parseFilter: function(c, filter, column, parsed, forceParse){
+		return forceParse || parsed ?
+			c.parsers[column].format( filter, c.table, [], column ) :
+			filter;
+	},
+	buildRow: function(table, c, wo) {
+		var col, column, $header, buildSelect, disabled, name, ffxn,
+			// c.columns defined in computeThIndexes()
+			columns = c.columns,
+			arry = $.isArray(wo.filter_cellFilter),
+			buildFilter = '<tr role="row" class="' + ts.css.filterRow + '">';
+		for (column = 0; column < columns; column++) {
+			if (arry) {
+				buildFilter += '<td' + ( wo.filter_cellFilter[column] ? ' class="' + wo.filter_cellFilter[column] + '"' : '' ) + '></td>';
+			} else {
+				buildFilter += '<td' + ( wo.filter_cellFilter !== '' ? ' class="' + wo.filter_cellFilter + '"' : '' ) + '></td>';
+			}
+		}
+		c.$filters = $(buildFilter += '</tr>').appendTo( c.$table.children('thead').eq(0) ).find('td');
+		// build each filter input
+		for (column = 0; column < columns; column++) {
+			disabled = false;
+			// assuming last cell of a column is the main column
+			$header = c.$headers.filter('[data-column="' + column + '"]:last');
+			ffxn = ts.getColumnData( table, wo.filter_functions, column );
+			buildSelect = (wo.filter_functions && ffxn && typeof ffxn !== "function" ) ||
+				$header.hasClass('filter-select');
+			// get data from jQuery data, metadata, headers option or header class name
+			col = ts.getColumnData( table, c.headers, column );
+			disabled = ts.getData($header[0], col, 'filter') === 'false' || ts.getData($header[0], col, 'parser') === 'false';
+
+			if (buildSelect) {
+				buildFilter = $('<select>').appendTo( c.$filters.eq(column) );
+			} else {
+				ffxn = ts.getColumnData( table, wo.filter_formatter, column );
+				if (ffxn) {
+					wo.filter_formatterCount++;
+					buildFilter = ffxn( c.$filters.eq(column), column );
+					// no element returned, so lets go find it
+					if (buildFilter && buildFilter.length === 0) {
+						buildFilter = c.$filters.eq(column).children('input');
+					}
+					// element not in DOM, so lets attach it
+					if ( buildFilter && (buildFilter.parent().length === 0 ||
+						(buildFilter.parent().length && buildFilter.parent()[0] !== c.$filters[column])) ) {
+						c.$filters.eq(column).append(buildFilter);
+					}
+				} else {
+					buildFilter = $('<input type="search">').appendTo( c.$filters.eq(column) );
+				}
+				if (buildFilter) {
+					buildFilter.attr('placeholder', $header.data('placeholder') || $header.attr('data-placeholder') || wo.filter_placeholder.search || '');
+				}
+			}
+			if (buildFilter) {
+				// add filter class name
+				name = ( $.isArray(wo.filter_cssFilter) ?
+					(typeof wo.filter_cssFilter[column] !== 'undefined' ? wo.filter_cssFilter[column] || '' : '') :
+					wo.filter_cssFilter ) || '';
+				buildFilter.addClass( ts.css.filter + ' ' + name ).attr('data-column', column);
+				if (disabled) {
+					buildFilter.attr('placeholder', '').addClass('disabled')[0].disabled = true; // disabled!
+				}
+			}
+		}
+	},
+	bindSearch: function(table, $el, internal) {
+		table = $(table)[0];
+		$el = $($el); // allow passing a selector string
+		if (!$el.length) { return; }
+		var c = table.config,
+			wo = c.widgetOptions,
+			$ext = wo.filter_$externalFilters;
+		if (internal !== true) {
+			// save anyMatch element
+			wo.filter_$anyMatch = $el.filter(wo.filter_anyColumnSelector + ',' + wo.filter_multipleColumnSelector);
+			if ($ext && $ext.length) {
+				wo.filter_$externalFilters = wo.filter_$externalFilters.add( $el );
+			} else {
+				wo.filter_$externalFilters = $el;
+			}
+			// update values (external filters added after table initialization)
+			ts.setFilters(table, c.$table.data('lastSearch') || [], internal === false);
+		}
+		$el
+		// use data attribute instead of jQuery data since the head is cloned without including the data/binding
+		.attr('data-lastSearchTime', new Date().getTime())
+		.unbind( $.trim('keypress keyup search change '.split(' ').join(c.namespace + 'filter ')) )
+		// include change for select - fixes #473
+		.bind('keyup' + c.namespace + 'filter', function(event) {
+			$(this).attr('data-lastSearchTime', new Date().getTime());
+			// emulate what webkit does.... escape clears the filter
+			if (event.which === 27) {
+				this.value = '';
+			// live search
+			} else if ( wo.filter_liveSearch === false ) {
+				return;
+				// don't return if the search value is empty (all rows need to be revealed)
+			} else if ( this.value !== '' && (
+				// liveSearch can contain a min value length; ignore arrow and meta keys, but allow backspace
+				( typeof wo.filter_liveSearch === 'number' && this.value.length < wo.filter_liveSearch ) ||
+				// let return & backspace continue on, but ignore arrows & non-valid characters
+				( event.which !== 13 && event.which !== 8 && ( event.which < 32 || (event.which >= 37 && event.which <= 40) ) ) ) ) {
+				return;
+			}
+			// change event = no delay; last true flag tells getFilters to skip newest timed input
+			ts.filter.searching( table, true, true );
+		})
+		.bind( $.trim('search change keypress '.split(' ').join(c.namespace + 'filter ')), function(event){
+			var column = $(this).data('column');
+			// don't allow "change" event to process if the input value is the same - fixes #685
+			if (event.which === 13 || event.type === 'search' || event.type === 'change' && this.value !== c.lastSearch[column]) {
+				event.preventDefault();
+				// init search with no delay
+				$(this).attr('data-lastSearchTime', new Date().getTime());
+				ts.filter.searching( table, false, true );
+			}
+		});
+	},
+	searching: function(table, filter, skipFirst) {
+		var wo = table.config.widgetOptions;
+		clearTimeout(wo.searchTimer);
+		if (typeof filter === 'undefined' || filter === true) {
+			// delay filtering
+			wo.searchTimer = setTimeout(function() {
+				ts.filter.checkFilters(table, filter, skipFirst );
+			}, wo.filter_liveSearch ? wo.filter_searchDelay : 10);
+		} else {
+			// skip delay
+			ts.filter.checkFilters(table, filter, skipFirst);
+		}
+	},
+	checkFilters: function(table, filter, skipFirst) {
+		var c = table.config,
+			wo = c.widgetOptions,
+			filterArray = $.isArray(filter),
+			filters = (filterArray) ? filter : ts.getFilters(table, true),
+			combinedFilters = (filters || []).join(''); // combined filter values
+		// prevent errors if delay init is set
+		if ($.isEmptyObject(c.cache)) {
+			// update cache if delayInit set & pager has initialized (after user initiates a search)
+			if (c.delayInit && c.pager && c.pager.initialized) {
+				c.$table.trigger('updateCache', [function(){
+					ts.filter.checkFilters(table, false, skipFirst);
+				}] );
+			}
+			return;
+		}
+		// add filter array back into inputs
+		if (filterArray) {
+			ts.setFilters( table, filters, false, skipFirst !== true );
+			if (!wo.filter_initialized) { c.lastCombinedFilter = ''; }
+		}
+		if (wo.filter_hideFilters) {
+			// show/hide filter row as needed
+			c.$table.find('.' + ts.css.filterRow).trigger( combinedFilters === '' ? 'mouseleave' : 'mouseenter' );
+		}
+		// return if the last search is the same; but filter === false when updating the search
+		// see example-widget-filter.html filter toggle buttons
+		if (c.lastCombinedFilter === combinedFilters && filter !== false) {
+			return;
+		} else if (filter === false) {
+			// force filter refresh
+			c.lastCombinedFilter = null;
+			c.lastSearch = [];
+		}
+		if (wo.filter_initialized) { c.$table.trigger('filterStart', [filters]); }
+		if (c.showProcessing) {
+			// give it time for the processing icon to kick in
+			setTimeout(function() {
+				ts.filter.findRows(table, filters, combinedFilters);
+				return false;
+			}, 30);
+		} else {
+			ts.filter.findRows(table, filters, combinedFilters);
+			return false;
+		}
+	},
+	hideFilters: function(table, c) {
+		var $filterRow, $filterRow2, timer;
+		$(table)
+			.find('.' + ts.css.filterRow)
+			.addClass('hideme')
+			.bind('mouseenter mouseleave', function(e) {
+				// save event object - http://bugs.jquery.com/ticket/12140
+				var event = e;
+				$filterRow = $(this);
+				clearTimeout(timer);
+				timer = setTimeout(function() {
+					if ( /enter|over/.test(event.type) ) {
+						$filterRow.removeClass('hideme');
+					} else {
+						// don't hide if input has focus
+						// $(':focus') needs jQuery 1.6+
+						if ( $(document.activeElement).closest('tr')[0] !== $filterRow[0] ) {
+							// don't hide row if any filter has a value
+							if (c.lastCombinedFilter === '') {
+								$filterRow.addClass('hideme');
+							}
+						}
+					}
+				}, 200);
+			})
+			.find('input, select').bind('focus blur', function(e) {
+				$filterRow2 = $(this).closest('tr');
+				clearTimeout(timer);
+				var event = e;
+				timer = setTimeout(function() {
+					// don't hide row if any filter has a value
+					if (ts.getFilters(c.$table).join('') === '') {
+						$filterRow2[ event.type === 'focus' ? 'removeClass' : 'addClass']('hideme');
+					}
+				}, 200);
+			});
+	},
+	defaultFilter: function(filter, mask){
+		if (filter === '') { return filter; }
+		var regex = ts.filter.regex.iQuery,
+			maskLen = mask.match( ts.filter.regex.igQuery ).length,
+			query = maskLen > 1 ? $.trim(filter).split(/\s/) : [ $.trim(filter) ],
+			len = query.length - 1,
+			indx = 0,
+			val = mask;
+		if ( len < 1 && maskLen > 1 ) {
+			// only one "word" in query but mask has >1 slots
+			query[1] = query[0];
+		}
+		// replace all {query} with query words...
+		// if query = "Bob", then convert mask from "!{query}" to "!Bob"
+		// if query = "Bob Joe Frank", then convert mask "{q} OR {q}" to "Bob OR Joe OR Frank"
+		while (regex.test(val)) {
+			val = val.replace(regex, query[indx++] || '');
+			if (regex.test(val) && indx < len && (query[indx] || '') !== '') {
+				val = mask.replace(regex, val);
+			}
+		}
+		return val;
+	},
+	getLatestSearch: function( $input ) {
+		return $input.sort(function(a, b) {
+			return $(b).attr('data-lastSearchTime') - $(a).attr('data-lastSearchTime');
+		});
+	},
+	multipleColumns: function( c, $input ) {
+		// look for multiple columns "1-3,4-6,8" in data-column
+		var ranges, singles, indx,
+			wo = c.widgetOptions,
+			// only target "all" column inputs on initialization
+			// & don't target "all" column inputs if they don't exist
+			targets = wo.filter_initialized || !$input.filter(wo.filter_anyColumnSelector).length,
+			columns = [],
+			val = $.trim( ts.filter.getLatestSearch( $input ).attr('data-column') );
+		// process column range
+		if ( targets && /-/.test( val ) ) {
+			ranges = val.match( /(\d+)\s*-\s*(\d+)/g );
+			$.each(ranges, function(i,v){
+				var t,
+					range = v.split( /\s*-\s*/ ),
+					start = parseInt( range[0], 10 ) || 0,
+					end = parseInt( range[1], 10 ) || ( c.columns - 1 );
+				if ( start > end ) { t = start; start = end; end = t; } // swap
+				if ( end >= c.columns ) { end = c.columns - 1; }
+				for ( ; start <= end; start++ ) {
+					columns.push(start);
+				}
+				// remove processed range from val
+				val = val.replace( v, '' );
+			});
+		}
+		// process single columns
+		if ( targets && /,/.test( val ) ) {
+			singles = val.split( /\s*,\s*/ );
+			$.each( singles, function(i,v) {
+				if (v !== '') {
+					indx = parseInt( v, 10 );
+					if ( indx < c.columns ) {
+						columns.push( indx );
+					}
+				}
+			});
+		}
+		// return all columns
+		if (!columns.length) {
+			for ( indx = 0; indx < c.columns; indx++ ) {
+				columns.push( indx );
+			}
+		}
+		return columns;
+	},
+	findRows: function(table, filters, combinedFilters) {
+		if (table.config.lastCombinedFilter === combinedFilters || !table.config.widgetOptions.filter_initialized) { return; }
+		var len, $rows, rowIndex, tbodyIndex, $tbody, $cells, $cell, columnIndex,
+			childRow, lastSearch, hasSelect, matches, result, showRow, time, val, indx,
+			notFiltered, searchFiltered, filterMatched, excludeMatch, fxn, ffxn,
+			regex = ts.filter.regex,
+			c = table.config,
+			wo = c.widgetOptions,
+			$tbodies = c.$table.children('tbody'), // target all tbodies #568
+			// data object passed to filters; anyMatch is a flag for the filters
+			data = { anyMatch: false },
+			// anyMatch really screws up with these types of filters
+			noAnyMatch = [ 'range', 'notMatch',  'operators' ];
+
+		// parse columns after formatter, in case the class is added at that point
+		data.parsed = c.$headers.map(function(columnIndex) {
+			return c.parsers && c.parsers[columnIndex] && c.parsers[columnIndex].parsed ||
+				// getData won't return "parsed" if other "filter-" class names exist (e.g. <th class="filter-select filter-parsed">)
+				ts.getData && ts.getData(c.$headers.filter('[data-column="' + columnIndex + '"]:last'), ts.getColumnData( table, c.headers, columnIndex ), 'filter') === 'parsed' ||
+				$(this).hasClass('filter-parsed');
+		}).get();
+
+		if (c.debug) {
+			ts.log('Starting filter widget search', filters);
+			time = new Date();
+		}
+		// filtered rows count
+		c.filteredRows = 0;
+		c.totalRows = 0;
+		// combindedFilters are undefined on init
+		combinedFilters = (filters || []).join('');
+
+		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
+			if ($tbodies.eq(tbodyIndex).hasClass(c.cssInfoBlock || ts.css.info)) { continue; } // ignore info blocks, issue #264
+			$tbody = ts.processTbody(table, $tbodies.eq(tbodyIndex), true);
+			// skip child rows & widget added (removable) rows - fixes #448 thanks to @hempel!
+			// $rows = $tbody.children('tr').not(c.selectorRemove);
+			columnIndex = c.columns;
+			// convert stored rows into a jQuery object
+			$rows = $( $.map(c.cache[tbodyIndex].normalized, function(el){ return el[columnIndex].$row.get(); }) );
+
+			if (combinedFilters === '' || wo.filter_serversideFiltering) {
+				$rows.removeClass(wo.filter_filteredRow).not('.' + c.cssChildRow).show();
+			} else {
+				// filter out child rows
+				$rows = $rows.not('.' + c.cssChildRow);
+				len = $rows.length;
+				// optimize searching only through already filtered rows - see #313
+				searchFiltered = wo.filter_searchFiltered;
+				lastSearch = c.lastSearch || c.$table.data('lastSearch') || [];
+				if (searchFiltered) {
+					// cycle through all filters; include last (columnIndex + 1 = match any column). Fixes #669
+					for (indx = 0; indx < columnIndex + 1; indx++) {
+						val = filters[indx] || '';
+						// break out of loop if we've already determined not to search filtered rows
+						if (!searchFiltered) { indx = columnIndex; }
+						// search already filtered rows if...
+						searchFiltered = searchFiltered && lastSearch.length &&
+							// there are no changes from beginning of filter
+							val.indexOf(lastSearch[indx] || '') === 0 &&
+							// if there is NOT a logical "or", or range ("to" or "-") in the string
+							!regex.alreadyFiltered.test(val) &&
+							// if we are not doing exact matches, using "|" (logical or) or not "!"
+							!/[=\"\|!]/.test(val) &&
+							// don't search only filtered if the value is negative ('> -10' => '> -100' will ignore hidden rows)
+							!(/(>=?\s*-\d)/.test(val) || /(<=?\s*\d)/.test(val)) &&
+							// if filtering using a select without a "filter-match" class (exact match) - fixes #593
+							!( val !== '' && c.$filters && c.$filters.eq(indx).find('select').length && !c.$headers.filter('[data-column="' + indx + '"]:last').hasClass('filter-match') );
+					}
+				}
+				notFiltered = $rows.not('.' + wo.filter_filteredRow).length;
+				// can't search when all rows are hidden - this happens when looking for exact matches
+				if (searchFiltered && notFiltered === 0) { searchFiltered = false; }
+				if (c.debug) {
+					ts.log( "Searching through " + ( searchFiltered && notFiltered < len ? notFiltered : "all" ) + " rows" );
+				}
+				if ((wo.filter_$anyMatch && wo.filter_$anyMatch.length) || filters[c.columns]) {
+					data.anyMatchFlag = true;
+					data.anyMatchFilter = wo.filter_$anyMatch && ts.filter.getLatestSearch( wo.filter_$anyMatch ).val() || filters[c.columns] || '';
+					if (c.sortLocaleCompare) {
+						// replace accents
+						data.anyMatchFilter = ts.replaceAccents(data.anyMatchFilter);
+					}
+					if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) || '')) {
+						data.anyMatchFilter = ts.filter.defaultFilter( data.anyMatchFilter, ts.getColumnData( table, wo.filter_defaultFilter, c.columns, true ) );
+						// clear search filtered flag because default filters are not saved to the last search
+						searchFiltered = false;
+					}
+					// make iAnyMatchFilter lowercase unless both filter widget & core ignoreCase options are true
+					// when c.ignoreCase is true, the cache contains all lower case data
+					data.iAnyMatchFilter = !(wo.filter_ignoreCase && c.ignoreCase) ? data.anyMatchFilter : data.anyMatchFilter.toLocaleLowerCase();
+				}
+
+				// loop through the rows
+				for (rowIndex = 0; rowIndex < len; rowIndex++) {
+
+					data.cacheArray = c.cache[tbodyIndex].normalized[rowIndex];
+
+					childRow = $rows[rowIndex].className;
+					// skip child rows & already filtered rows
+					if ( regex.child.test(childRow) || (searchFiltered && regex.filtered.test(childRow)) ) { continue; }
+					showRow = true;
+					// *** nextAll/nextUntil not supported by Zepto! ***
+					childRow = $rows.eq(rowIndex).nextUntil('tr:not(.' + c.cssChildRow + ')');
+					// so, if "table.config.widgetOptions.filter_childRows" is true and there is
+					// a match anywhere in the child row, then it will make the row visible
+					// checked here so the option can be changed dynamically
+					data.childRowText = (childRow.length && wo.filter_childRows) ? childRow.text() : '';
+					data.childRowText = wo.filter_ignoreCase ? data.childRowText.toLocaleLowerCase() : data.childRowText;
+					$cells = $rows.eq(rowIndex).children();
+					if (data.anyMatchFlag) {
+						// look for multiple columns "1-3,4-6,8"
+						columnIndex = ts.filter.multipleColumns( c, wo.filter_$anyMatch );
+						data.anyMatch = true;
+						data.rowArray = $cells.map(function(i){
+							if ( $.inArray(i, columnIndex) > -1 ) {
+								var txt;
+								if (data.parsed[i]) {
+									txt = data.cacheArray[i];
+								} else {
+									txt = this ? this.getAttribute( c.textAttribute ) || this.textContent || $(this).text() : '';
+									txt = $.trim( wo.filter_ignoreCase ? txt.toLowerCase() : txt );
+									if (c.sortLocaleCompare) {
+										txt = ts.replaceAccents(txt);
+									}
+								}
+								return txt;
+							}
+						}).get();
+						data.filter = data.anyMatchFilter;
+						data.iFilter = data.iAnyMatchFilter;
+						data.exact = data.rowArray.join(' ');
+						data.iExact = wo.filter_ignoreCase ? data.exact.toLowerCase() : data.exact;
+						data.cache = data.cacheArray.slice(0,-1).join(' ');
+						filterMatched = null;
+						$.each(ts.filter.types, function(type, typeFunction) {
+							if ($.inArray(type, noAnyMatch) < 0) {
+								matches = typeFunction( c, data );
+								if (matches !== null) {
+									filterMatched = matches;
+									return false;
+								}
+							}
+						});
+						if (filterMatched !== null) {
+							showRow = filterMatched;
+						} else {
+							if (wo.filter_startsWith) {
+								showRow = false;
+								columnIndex = c.columns;
+								while (!showRow && columnIndex > 0) {
+									columnIndex--;
+									showRow = showRow || data.rowArray[columnIndex].indexOf(data.iFilter) === 0;
+								}
+							} else {
+								showRow = (data.iExact + data.childRowText).indexOf(data.iFilter) >= 0;
+							}
+						}
+						data.anyMatch = false;
+					}
+
+					for (columnIndex = 0; columnIndex < c.columns; columnIndex++) {
+						data.filter = filters[columnIndex];
+						data.index = columnIndex;
+
+						// filter types to exclude, per column
+						excludeMatch = ( ts.getColumnData( table, wo.filter_excludeFilter, columnIndex, true ) || '' ).split(/\s+/);
+
+						// ignore if filter is empty or disabled
+						if (data.filter) {
+							data.cache = data.cacheArray[columnIndex];
+							// check if column data should be from the cell or from parsed data
+							if (wo.filter_useParsedData || data.parsed[columnIndex]) {
+								data.exact = data.cache;
+							} else {
+								val = $cells[columnIndex];
+								result = val ? $.trim( val.getAttribute( c.textAttribute ) || val.textContent || $cells.eq(columnIndex).text() ) : '';
+								data.exact = c.sortLocaleCompare ? ts.replaceAccents(result) : result; // issue #405
+							}
+							data.iExact = !regex.type.test(typeof data.exact) && wo.filter_ignoreCase ? data.exact.toLocaleLowerCase() : data.exact;
+							result = showRow; // if showRow is true, show that row
+
+							// in case select filter option has a different value vs text "a - z|A through Z"
+							ffxn = wo.filter_columnFilters ?
+								c.$filters.add(c.$externalFilters).filter('[data-column="'+ columnIndex + '"]').find('select option:selected').attr('data-function-name') || '' : '';
+							// replace accents - see #357
+							if (c.sortLocaleCompare) {
+								data.filter = ts.replaceAccents(data.filter);
+							}
+
+							val = true;
+							if (wo.filter_defaultFilter && regex.iQuery.test( ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) || '')) {
+								data.filter = ts.filter.defaultFilter( data.filter, ts.getColumnData( table, wo.filter_defaultFilter, columnIndex ) );
+								// val is used to indicate that a filter select is using a default filter; so we override the exact & partial matches
+								val = false;
+							}
+							// data.iFilter = case insensitive (if wo.filter_ignoreCase is true), data.filter = case sensitive
+							data.iFilter = wo.filter_ignoreCase ? (data.filter || '').toLocaleLowerCase() : data.filter;
+							fxn = ts.getColumnData( table, wo.filter_functions, columnIndex );
+							$cell = c.$headers.filter('[data-column="' + columnIndex + '"]:last');
+							hasSelect = $cell.hasClass('filter-select');
+							if ( fxn || ( hasSelect && val ) ) {
+								if (fxn === true || hasSelect) {
+									// default selector uses exact match unless "filter-match" class is found
+									result = ($cell.hasClass('filter-match')) ? data.iExact.search(data.iFilter) >= 0 : data.filter === data.exact;
+								} else if (typeof fxn === 'function') {
+									// filter callback( exact cell content, parser normalized content, filter input value, column index, jQuery row object )
+									result = fxn(data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex));
+								} else if (typeof fxn[ffxn || data.filter] === 'function') {
+									// selector option function
+									result = fxn[ffxn || data.filter](data.exact, data.cache, data.filter, columnIndex, $rows.eq(rowIndex));
+								}
+							} else {
+								filterMatched = null;
+								// cycle through the different filters
+								// filters return a boolean or null if nothing matches
+								$.each(ts.filter.types, function(type, typeFunction) {
+									if ($.inArray(type, excludeMatch) < 0) {
+										matches = typeFunction( c, data );
+										if (matches !== null) {
+											filterMatched = matches;
+											return false;
+										}
+									}
+								});
+								if (filterMatched !== null) {
+									result = filterMatched;
+								// Look for match, and add child row data for matching
+								} else {
+									data.exact = (data.iExact + data.childRowText).indexOf( ts.filter.parseFilter(c, data.iFilter, columnIndex, data.parsed[columnIndex]) );
+									result = ( (!wo.filter_startsWith && data.exact >= 0) || (wo.filter_startsWith && data.exact === 0) );
+								}
+							}
+							showRow = (result) ? showRow : false;
+						}
+					}
+					$rows.eq(rowIndex)
+						.toggle(showRow)
+						.toggleClass(wo.filter_filteredRow, !showRow);
+					if (childRow.length) {
+						childRow.toggleClass(wo.filter_filteredRow, !showRow);
+					}
+				}
+			}
+			c.filteredRows += $rows.not('.' + wo.filter_filteredRow).length;
+			c.totalRows += $rows.length;
+			ts.processTbody(table, $tbody, false);
+		}
+		c.lastCombinedFilter = combinedFilters; // save last search
+		c.lastSearch = filters;
+		c.$table.data('lastSearch', filters);
+		if (wo.filter_saveFilters && ts.storage) {
+			ts.storage( table, 'tablesorter-filters', filters );
+		}
+		if (c.debug) {
+			ts.benchmark("Completed filter widget search", time);
+		}
+		if (wo.filter_initialized) { c.$table.trigger('filterEnd', c ); }
+		setTimeout(function(){
+			c.$table.trigger('applyWidgets'); // make sure zebra widget is applied
+		}, 0);
+	},
+	getOptionSource: function(table, column, onlyAvail) {
+		table = $(table)[0];
+		var cts,
+			c = table.config,
+			wo = c.widgetOptions,
+			parsed = [],
+			arry = false,
+			source = wo.filter_selectSource,
+			last = c.$table.data('lastSearch') || [],
+			fxn = $.isFunction(source) ? true : ts.getColumnData( table, source, column );
+
+		if (onlyAvail && last[column] !== '') {
+			onlyAvail = false;
+		}
+
+		// filter select source option
+		if (fxn === true) {
+			// OVERALL source
+			arry = source(table, column, onlyAvail);
+		} else if ( fxn instanceof $ || ($.type(fxn) === 'string' && fxn.indexOf('</option>') >= 0) ) {
+			// selectSource is a jQuery object or string of options
+			return fxn;
+		} else if ($.isArray(fxn)) {
+			arry = fxn;
+		} else if ($.type(source) === 'object' && fxn) {
+			// custom select source function for a SPECIFIC COLUMN
+			arry = fxn(table, column, onlyAvail);
+		}
+		if (arry === false) {
+			// fall back to original method
+			arry = ts.filter.getOptions(table, column, onlyAvail);
+		}
+
+		// get unique elements and sort the list
+		// if $.tablesorter.sortText exists (not in the original tablesorter),
+		// then natural sort the list otherwise use a basic sort
+		arry = $.grep(arry, function(value, indx) {
+			return $.inArray(value, arry) === indx;
+		});
+
+		if (c.$headers.filter('[data-column="' + column + '"]:last').hasClass('filter-select-nosort')) {
+			// unsorted select options
+			return arry;
+		} else {
+			// parse select option values
+			$.each(arry, function(i, v){
+				// parse array data using set column parser; this DOES NOT pass the original
+				// table cell to the parser format function
+				parsed.push({ t : v, p : c.parsers && c.parsers[column].format( v, table, [], column ) });
+			});
+
+			// sort parsed select options
+			cts = c.textSorter || '';
+			parsed.sort(function(a, b){
+				// sortNatural breaks if you don't pass it strings
+				var x = a.p.toString(), y = b.p.toString();
+				if ($.isFunction(cts)) {
+					// custom OVERALL text sorter
+					return cts(x, y, true, column, table);
+				} else if (typeof(cts) === 'object' && cts.hasOwnProperty(column)) {
+					// custom text sorter for a SPECIFIC COLUMN
+					return cts[column](x, y, true, column, table);
+				} else if (ts.sortNatural) {
+					// fall back to natural sort
+					return ts.sortNatural(x, y);
+				}
+				// using an older version! do a basic sort
+				return true;
+			});
+			// rebuild arry from sorted parsed data
+			arry = [];
+			$.each(parsed, function(i, v){
+				arry.push(v.t);
+			});
+			return arry;
+		}
+	},
+	getOptions: function(table, column, onlyAvail) {
+		table = $(table)[0];
+		var rowIndex, tbodyIndex, len, row, cache, cell,
+			c = table.config,
+			wo = c.widgetOptions,
+			$tbodies = c.$table.children('tbody'),
+			arry = [];
+		for (tbodyIndex = 0; tbodyIndex < $tbodies.length; tbodyIndex++ ) {
+			if (!$tbodies.eq(tbodyIndex).hasClass(c.cssInfoBlock)) {
+				cache = c.cache[tbodyIndex];
+				len = c.cache[tbodyIndex].normalized.length;
+				// loop through the rows
+				for (rowIndex = 0; rowIndex < len; rowIndex++) {
+					// get cached row from cache.row (old) or row data object (new; last item in normalized array)
+					row = cache.row ? cache.row[rowIndex] : cache.normalized[rowIndex][c.columns].$row[0];
+					// check if has class filtered
+					if (onlyAvail && row.className.match(wo.filter_filteredRow)) { continue; }
+					// get non-normalized cell content
+					if (wo.filter_useParsedData || c.parsers[column].parsed || c.$headers.filter('[data-column="' + column + '"]:last').hasClass('filter-parsed')) {
+						arry.push( '' + cache.normalized[rowIndex][column] );
+					} else {
+						cell = row.cells[column];
+						if (cell) {
+							arry.push( $.trim( cell.getAttribute( c.textAttribute ) || cell.textContent || $(cell).text() ) );
+						}
+					}
+				}
+			}
+		}
+		return arry;
+	},
+	buildSelect: function(table, column, arry, updating, onlyAvail) {
+		table = $(table)[0];
+		column = parseInt(column, 10);
+		if (!table.config.cache || $.isEmptyObject(table.config.cache)) { return; }
+		var indx, val, txt, t, $filters, $filter,
+			c = table.config,
+			wo = c.widgetOptions,
+			node = c.$headers.filter('[data-column="' + column + '"]:last'),
+			// t.data('placeholder') won't work in jQuery older than 1.4.3
+			options = '<option value="">' + ( node.data('placeholder') || node.attr('data-placeholder') || wo.filter_placeholder.select || '' ) + '</option>',
+			// Get curent filter value
+			currentValue = c.$table.find('thead').find('select.' + ts.css.filter + '[data-column="' + column + '"]').val();
+		// nothing included in arry (external source), so get the options from filter_selectSource or column data
+		if (typeof arry === 'undefined' || arry === '') {
+			arry = ts.filter.getOptionSource(table, column, onlyAvail);
+		}
+
+		if ($.isArray(arry)) {
+			// build option list
+			for (indx = 0; indx < arry.length; indx++) {
+				txt = arry[indx] = ('' + arry[indx]).replace(/\"/g, "&quot;");
+				val = txt;
+				// allow including a symbol in the selectSource array
+				// "a-z|A through Z" so that "a-z" becomes the option value
+				// and "A through Z" becomes the option text
+				if (txt.indexOf(wo.filter_selectSourceSeparator) >= 0) {
+					t = txt.split(wo.filter_selectSourceSeparator);
+					val = t[0];
+					txt = t[1];
+				}
+				// replace quotes - fixes #242 & ignore empty strings - see http://stackoverflow.com/q/14990971/145346
+				options += arry[indx] !== '' ? '<option ' + (val === txt ? '' : 'data-function-name="' + arry[indx] + '" ') + 'value="' + val + '">' + txt + '</option>' : '';
+			}
+			// clear arry so it doesn't get appended twice
+			arry = [];
+		}
+
+		// update all selects in the same column (clone thead in sticky headers & any external selects) - fixes 473
+		$filters = ( c.$filters ? c.$filters : c.$table.children('thead') ).find('.' + ts.css.filter);
+		if (wo.filter_$externalFilters) {
+			$filters = $filters && $filters.length ? $filters.add(wo.filter_$externalFilters) : wo.filter_$externalFilters;
+		}
+		$filter = $filters.filter('select[data-column="' + column + '"]');
+
+		// make sure there is a select there!
+		if ($filter.length) {
+			$filter[ updating ? 'html' : 'append' ](options);
+			if (!$.isArray(arry)) {
+				// append options if arry is provided externally as a string or jQuery object
+				// options (default value) was already added
+				$filter.append(arry).val(currentValue);
+			}
+			$filter.val(currentValue);
+		}
+	},
+	buildDefault: function(table, updating) {
+		var columnIndex, $header, noSelect,
+			c = table.config,
+			wo = c.widgetOptions,
+			columns = c.columns;
+		// build default select dropdown
+		for (columnIndex = 0; columnIndex < columns; columnIndex++) {
+			$header = c.$headers.filter('[data-column="' + columnIndex + '"]:last');
+			noSelect = !($header.hasClass('filter-false') || $header.hasClass('parser-false'));
+			// look for the filter-select class; build/update it if found
+			if (($header.hasClass('filter-select') || ts.getColumnData( table, wo.filter_functions, columnIndex ) === true) && noSelect) {
+				ts.filter.buildSelect(table, columnIndex, '', updating, $header.hasClass(wo.filter_onlyAvail));
+			}
+		}
+	}
+};
+
+ts.getFilters = function(table, getRaw, setFilters, skipFirst) {
+	var i, $filters, $column, cols,
+		filters = false,
+		c = table ? $(table)[0].config : '',
+		wo = c ? c.widgetOptions : '';
+	if (getRaw !== true && wo && !wo.filter_columnFilters) {
+		return $(table).data('lastSearch');
+	}
+	if (c) {
+		if (c.$filters) {
+			$filters = c.$filters.find('.' + ts.css.filter);
+		}
+		if (wo.filter_$externalFilters) {
+			$filters = $filters && $filters.length ? $filters.add(wo.filter_$externalFilters) : wo.filter_$externalFilters;
+		}
+		if ($filters && $filters.length) {
+			filters = setFilters || [];
+			for (i = 0; i < c.columns + 1; i++) {
+				cols = ( i === c.columns ?
+					// "all" columns can now include a range or set of columms (data-column="0-2,4,6-7")
+					wo.filter_anyColumnSelector + ',' + wo.filter_multipleColumnSelector :
+					'[data-column="' + i + '"]' );
+				$column = $filters.filter(cols);
+				if ($column.length) {
+					// move the latest search to the first slot in the array
+					$column = ts.filter.getLatestSearch( $column );
+					if ($.isArray(setFilters)) {
+						// skip first (latest input) to maintain cursor position while typing
+						if (skipFirst) { $column.slice(1); }
+						if (i === c.columns) {
+							// prevent data-column="all" from filling data-column="0,1" (etc)
+							cols = $column.filter(wo.filter_anyColumnSelector);
+							$column = cols.length ? cols : $column;
+						}
+						$column
+							.val( setFilters[i] )
+							.trigger('change.tsfilter');
+					} else {
+						filters[i] = $column.val() || '';
+						// don't change the first... it will move the cursor
+						if (i === c.columns) {
+							// don't update range columns from "all" setting
+							$column.slice(1).filter('[data-column*="' + $column.attr('data-column') + '"]').val( filters[i] );
+						} else {
+							$column.slice(1).val( filters[i] );
+						}
+					}
+					// save any match input dynamically
+					if (i === c.columns && $column.length) {
+						wo.filter_$anyMatch = $column;
+					}
+				}
+			}
+		}
+	}
+	if (filters.length === 0) {
+		filters = false;
+	}
+	return filters;
+};
+
+ts.setFilters = function(table, filter, apply, skipFirst) {
+	var c = table ? $(table)[0].config : '',
+		valid = ts.getFilters(table, true, filter, skipFirst);
+	if (c && apply) {
+		// ensure new set filters are applied, even if the search is the same
+		c.lastCombinedFilter = null;
+		c.lastSearch = [];
+		ts.filter.searching(c.table, filter, skipFirst);
+		c.$table.trigger('filterFomatterUpdate');
+	}
+	return !!valid;
+};
+
+})(jQuery);
diff --git a/js/widgets/widget-resizable.js b/js/widgets/widget-resizable.js
new file mode 100644
index 00000000..fd8e8fca
--- /dev/null
+++ b/js/widgets/widget-resizable.js
@@ -0,0 +1,176 @@
+/*! Widget: resizable */
+;(function ($, window) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+$.extend(ts.css, {
+	resizer : 'tablesorter-resizer' // resizable
+});
+
+// this widget saves the column widths if
+// $.tablesorter.storage function is included
+// **************************
+ts.addWidget({
+	id: "resizable",
+	priority: 40,
+	options: {
+		resizable : true,
+		resizable_addLastColumn : false,
+		resizable_widths : [],
+		resizable_throttle : false // set to true (5ms) or any number 0-10 range
+	},
+	format: function(table, c, wo) {
+		if (c.$table.hasClass('hasResizable')) { return; }
+		c.$table.addClass('hasResizable');
+		ts.resizableReset(table, true); // set default widths
+		var $rows, $columns, $column, column, timer,
+			storedSizes = {},
+			$table = c.$table,
+			$wrap = $table.parent(),
+			overflow = $table.parent().css('overflow') === 'auto',
+			mouseXPosition = 0,
+			$target = null,
+			$next = null,
+			fullWidth = Math.abs($table.parent().width() - $table.width()) < 20,
+			mouseMove = function(event){
+				if (mouseXPosition === 0 || !$target) { return; }
+				// resize columns
+				var leftEdge = event.pageX - mouseXPosition,
+					targetWidth = $target.width();
+				$target.width( targetWidth + leftEdge );
+				if ($target.width() !== targetWidth && fullWidth) {
+					$next.width( $next.width() - leftEdge );
+				} else if (overflow) {
+					$table.width(function(i, w){
+						return w + leftEdge;
+					});
+					if (!$next.length) {
+						// if expanding right-most column, scroll the wrapper
+						$wrap[0].scrollLeft = $table.width();
+					}
+				}
+				mouseXPosition = event.pageX;
+			},
+			stopResize = function() {
+				if (ts.storage && $target && $next) {
+					storedSizes = {};
+					storedSizes[$target.index()] = $target.width();
+					storedSizes[$next.index()] = $next.width();
+					$target.width( storedSizes[$target.index()] );
+					$next.width( storedSizes[$next.index()] );
+					if (wo.resizable !== false) {
+						// save all column widths
+						ts.storage(table, 'tablesorter-resizable', c.$headers.map(function(){ return $(this).width(); }).get() );
+					}
+				}
+				mouseXPosition = 0;
+				$target = $next = null;
+				$(window).trigger('resize'); // will update stickyHeaders, just in case
+			};
+		storedSizes = (ts.storage && wo.resizable !== false) ? ts.storage(table, 'tablesorter-resizable') : {};
+		// process only if table ID or url match
+		if (storedSizes) {
+			for (column in storedSizes) {
+				if (!isNaN(column) && column < c.$headers.length) {
+					c.$headers.eq(column).width(storedSizes[column]); // set saved resizable widths
+				}
+			}
+		}
+		$rows = $table.children('thead:first').children('tr');
+		// add resizable-false class name to headers (across rows as needed)
+		$rows.children().each(function() {
+			var canResize,
+				$column = $(this);
+			column = $column.attr('data-column');
+			canResize = ts.getData( $column, ts.getColumnData( table, c.headers, column ), 'resizable') === "false";
+			$rows.children().filter('[data-column="' + column + '"]')[canResize ? 'addClass' : 'removeClass']('resizable-false');
+		});
+		// add wrapper inside each cell to allow for positioning of the resizable target block
+		$rows.each(function() {
+			$column = $(this).children().not('.resizable-false');
+			if (!$(this).find('.' + ts.css.wrapper).length) {
+				// Firefox needs this inner div to position the resizer correctly
+				$column.wrapInner('<div class="' + ts.css.wrapper + '" style="position:relative;height:100%;width:100%"></div>');
+			}
+			// don't include the last column of the row
+			if (!wo.resizable_addLastColumn) { $column = $column.slice(0,-1); }
+			$columns = $columns ? $columns.add($column) : $column;
+		});
+		$columns
+		.each(function() {
+			var $column = $(this),
+				padding = parseInt($column.css('padding-right'), 10) + 10; // 10 is 1/2 of the 20px wide resizer
+			$column
+				.find('.' + ts.css.wrapper)
+				.append('<div class="' + ts.css.resizer + '" style="cursor:w-resize;position:absolute;z-index:1;right:-' +
+					padding + 'px;top:0;height:100%;width:20px;"></div>');
+		})
+		.find('.' + ts.css.resizer)
+		.bind('mousedown', function(event) {
+			// save header cell and mouse position
+			$target = $(event.target).closest('th');
+			var $header = c.$headers.filter('[data-column="' + $target.attr('data-column') + '"]');
+			if ($header.length > 1) { $target = $target.add($header); }
+			// if table is not as wide as it's parent, then resize the table
+			$next = event.shiftKey ? $target.parent().find('th').not('.resizable-false').filter(':last') : $target.nextAll(':not(.resizable-false)').eq(0);
+			mouseXPosition = event.pageX;
+		});
+		$(document)
+		.bind('mousemove.tsresize', function(event) {
+			// ignore mousemove if no mousedown
+			if (mouseXPosition === 0 || !$target) { return; }
+			if (wo.resizable_throttle) {
+				clearTimeout(timer);
+				timer = setTimeout(function(){
+					mouseMove(event);
+				}, isNaN(wo.resizable_throttle) ? 5 : wo.resizable_throttle );
+			} else {
+				mouseMove(event);
+			}
+		})
+		.bind('mouseup.tsresize', function() {
+			stopResize();
+		});
+
+		// right click to reset columns to default widths
+		$table.find('thead:first').bind('contextmenu.tsresize', function() {
+			ts.resizableReset(table);
+			// $.isEmptyObject() needs jQuery 1.4+; allow right click if already reset
+			var allowClick = $.isEmptyObject ? $.isEmptyObject(storedSizes) : true;
+			storedSizes = {};
+			return allowClick;
+		});
+	},
+	remove: function(table, c) {
+		c.$table
+			.removeClass('hasResizable')
+			.children('thead')
+			.unbind('mouseup.tsresize mouseleave.tsresize contextmenu.tsresize')
+			.children('tr').children()
+			.unbind('mousemove.tsresize mouseup.tsresize')
+			// don't remove "tablesorter-wrapper" as uitheme uses it too
+			.find('.' + ts.css.resizer).remove();
+		ts.resizableReset(table);
+	}
+});
+ts.resizableReset = function(table, nosave) {
+	$(table).each(function(){
+		var $t,
+			c = this.config,
+			wo = c && c.widgetOptions;
+		if (table && c) {
+			c.$headers.each(function(i){
+				$t = $(this);
+				if (wo.resizable_widths && wo.resizable_widths[i]) {
+					$t.css('width', wo.resizable_widths[i]);
+				} else if (!$t.hasClass('resizable-false')) {
+					// don't clear the width of any column that is not resizable
+					$t.css('width','');
+				}
+			});
+			if (ts.storage && !nosave) { ts.storage(this, 'tablesorter-resizable', {}); }
+		}
+	});
+};
+
+})(jQuery, window);
diff --git a/js/widgets/widget-saveSort.js b/js/widgets/widget-saveSort.js
new file mode 100644
index 00000000..d09310d9
--- /dev/null
+++ b/js/widgets/widget-saveSort.js
@@ -0,0 +1,68 @@
+/*! Widget: saveSort */
+;(function ($) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+// this widget saves the last sort only if the
+// saveSort widget option is true AND the
+// $.tablesorter.storage function is included
+// **************************
+ts.addWidget({
+	id: 'saveSort',
+	priority: 20,
+	options: {
+		saveSort : true
+	},
+	init: function(table, thisWidget, c, wo) {
+		// run widget format before all other widgets are applied to the table
+		thisWidget.format(table, c, wo, true);
+	},
+	format: function(table, c, wo, init) {
+		var stored, time,
+			$table = c.$table,
+			saveSort = wo.saveSort !== false, // make saveSort active/inactive; default to true
+			sortList = { "sortList" : c.sortList };
+		if (c.debug) {
+			time = new Date();
+		}
+		if ($table.hasClass('hasSaveSort')) {
+			if (saveSort && table.hasInitialized && ts.storage) {
+				ts.storage( table, 'tablesorter-savesort', sortList );
+				if (c.debug) {
+					ts.benchmark('saveSort widget: Saving last sort: ' + c.sortList, time);
+				}
+			}
+		} else {
+			// set table sort on initial run of the widget
+			$table.addClass('hasSaveSort');
+			sortList = '';
+			// get data
+			if (ts.storage) {
+				stored = ts.storage( table, 'tablesorter-savesort' );
+				sortList = (stored && stored.hasOwnProperty('sortList') && $.isArray(stored.sortList)) ? stored.sortList : '';
+				if (c.debug) {
+					ts.benchmark('saveSort: Last sort loaded: "' + sortList + '"', time);
+				}
+				$table.bind('saveSortReset', function(event) {
+					event.stopPropagation();
+					ts.storage( table, 'tablesorter-savesort', '' );
+				});
+			}
+			// init is true when widget init is run, this will run this widget before all other widgets have initialized
+			// this method allows using this widget in the original tablesorter plugin; but then it will run all widgets twice.
+			if (init && sortList && sortList.length > 0) {
+				c.sortList = sortList;
+			} else if (table.hasInitialized && sortList && sortList.length > 0) {
+				// update sort change
+				$table.trigger('sorton', [sortList]);
+			}
+		}
+	},
+	remove: function(table, c) {
+		c.$table.removeClass('hasSaveSort');
+		// clear storage
+		if (ts.storage) { ts.storage( table, 'tablesorter-savesort', '' ); }
+	}
+});
+
+})(jQuery);
diff --git a/js/widgets/widget-stickyHeaders.js b/js/widgets/widget-stickyHeaders.js
new file mode 100644
index 00000000..6cc611cb
--- /dev/null
+++ b/js/widgets/widget-stickyHeaders.js
@@ -0,0 +1,269 @@
+/*! Widget: stickyHeaders */
+;(function ($, window) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+$.extend(ts.css, {
+	sticky    : 'tablesorter-stickyHeader', // stickyHeader
+	stickyVis : 'tablesorter-sticky-visible',
+	stickyWrap: 'tablesorter-sticky-wrapper'
+});
+
+// Add a resize event to table headers
+ts.addHeaderResizeEvent = function(table, disable, settings) {
+	table = $(table)[0]; // make sure we're using a dom element
+	var headers,
+		defaults = {
+			timer : 250
+		},
+		options = $.extend({}, defaults, settings),
+		c = table.config,
+		wo = c.widgetOptions,
+		checkSizes = function(triggerEvent) {
+			wo.resize_flag = true;
+			headers = [];
+			c.$headers.each(function() {
+				var $header = $(this),
+					sizes = $header.data('savedSizes') || [0,0], // fixes #394
+					width = this.offsetWidth,
+					height = this.offsetHeight;
+				if (width !== sizes[0] || height !== sizes[1]) {
+					$header.data('savedSizes', [ width, height ]);
+					headers.push(this);
+				}
+			});
+			if (headers.length && triggerEvent !== false) {
+				c.$table.trigger('resize', [ headers ]);
+			}
+			wo.resize_flag = false;
+		};
+	checkSizes(false);
+	clearInterval(wo.resize_timer);
+	if (disable) {
+		wo.resize_flag = false;
+		return false;
+	}
+	wo.resize_timer = setInterval(function() {
+		if (wo.resize_flag) { return; }
+		checkSizes();
+	}, options.timer);
+};
+
+// Sticky headers based on this awesome article:
+// http://css-tricks.com/13465-persistent-headers/
+// and https://github.com/jmosbech/StickyTableHeaders by Jonas Mosbech
+// **************************
+ts.addWidget({
+	id: "stickyHeaders",
+	priority: 60, // sticky widget must be initialized after the filter widget!
+	options: {
+		stickyHeaders : '',       // extra class name added to the sticky header row
+		stickyHeaders_attachTo : null, // jQuery selector or object to attach sticky header to
+		stickyHeaders_xScroll : null, // jQuery selector or object to monitor horizontal scroll position (defaults: xScroll > attachTo > window)
+		stickyHeaders_yScroll : null, // jQuery selector or object to monitor vertical scroll position (defaults: yScroll > attachTo > window)
+		stickyHeaders_offset : 0, // number or jquery selector targeting the position:fixed element
+		stickyHeaders_filteredToTop: true, // scroll table top into view after filtering
+		stickyHeaders_cloneId : '-sticky', // added to table ID, if it exists
+		stickyHeaders_addResizeEvent : true, // trigger "resize" event on headers
+		stickyHeaders_includeCaption : true, // if false and a caption exist, it won't be included in the sticky header
+		stickyHeaders_zIndex : 2 // The zIndex of the stickyHeaders, allows the user to adjust this to their needs
+	},
+	format: function(table, c, wo) {
+		// filter widget doesn't initialize on an empty table. Fixes #449
+		if ( c.$table.hasClass('hasStickyHeaders') || ($.inArray('filter', c.widgets) >= 0 && !c.$table.hasClass('hasFilters')) ) {
+			return;
+		}
+		var $table = c.$table,
+			$attach = $(wo.stickyHeaders_attachTo),
+			namespace = c.namespace + 'stickyheaders ',
+			// element to watch for the scroll event
+			$yScroll = $(wo.stickyHeaders_yScroll || wo.stickyHeaders_attachTo || window),
+			$xScroll = $(wo.stickyHeaders_xScroll || wo.stickyHeaders_attachTo || window),
+			$thead = $table.children('thead:first'),
+			$header = $thead.children('tr').not('.sticky-false').children(),
+			$tfoot = $table.children('tfoot'),
+			$stickyOffset = isNaN(wo.stickyHeaders_offset) ? $(wo.stickyHeaders_offset) : '',
+			stickyOffset = $attach.length ? 0 : $stickyOffset.length ?
+				$stickyOffset.height() || 0 : parseInt(wo.stickyHeaders_offset, 10) || 0,
+			// is this table nested? If so, find parent sticky header wrapper (div, not table)
+			$nestedSticky = $table.parent().closest('.' + ts.css.table).hasClass('hasStickyHeaders') ?
+				$table.parent().closest('table.tablesorter')[0].config.widgetOptions.$sticky.parent() : [],
+			nestedStickyTop = $nestedSticky.length ? $nestedSticky.height() : 0,
+			// clone table, then wrap to make sticky header
+			$stickyTable = wo.$sticky = $table.clone()
+				.addClass('containsStickyHeaders ' + ts.css.sticky + ' ' + wo.stickyHeaders)
+				.wrap('<div class="' + ts.css.stickyWrap + '">'),
+			$stickyWrap = $stickyTable.parent().css({
+				position   : $attach.length ? 'absolute' : 'fixed',
+				padding    : parseInt( $stickyTable.parent().parent().css('padding-left'), 10 ),
+				top        : stickyOffset + nestedStickyTop,
+				left       : 0,
+				visibility : 'hidden',
+				zIndex     : wo.stickyHeaders_zIndex || 2
+			}),
+			$stickyThead = $stickyTable.children('thead:first'),
+			$stickyCells,
+			laststate = '',
+			spacing = 0,
+			setWidth = function($orig, $clone){
+				$orig.filter(':visible').each(function(i) {
+					var width, border,
+						$cell = $clone.filter(':visible').eq(i),
+						$this = $(this);
+					// code from https://github.com/jmosbech/StickyTableHeaders
+					if ($this.css('box-sizing') === 'border-box') {
+						width = $this.outerWidth();
+					} else {
+						if ($cell.css('border-collapse') === 'collapse') {
+							if (window.getComputedStyle) {
+								width = parseFloat( window.getComputedStyle(this, null).width );
+							} else {
+								// ie8 only
+								border = parseFloat( $this.css('border-width') );
+								width = $this.outerWidth() - parseFloat( $this.css('padding-left') ) - parseFloat( $this.css('padding-right') ) - border;
+							}
+						} else {
+							width = $this.width();
+						}
+					}
+					$cell.css({
+						'min-width': width,
+						'max-width': width
+					});
+				});
+			},
+			resizeHeader = function() {
+				stickyOffset = $stickyOffset.length ? $stickyOffset.height() || 0 : parseInt(wo.stickyHeaders_offset, 10) || 0;
+				spacing = 0;
+				$stickyWrap.css({
+					left : $attach.length ? parseInt($attach.css('padding-left'), 10) || 0 :
+							$table.offset().left - parseInt($table.css('margin-left'), 10) - $xScroll.scrollLeft() - spacing,
+					width: $table.outerWidth()
+				});
+				setWidth( $table, $stickyTable );
+				setWidth( $header, $stickyCells );
+			};
+		// save stickyTable element to config
+		// it is also saved to wo.$sticky
+		if (c.$extraTables && c.$extraTables.length) {
+			c.$extraTables.add($stickyTable);
+		} else {
+			c.$extraTables = $stickyTable;
+		}
+		// fix clone ID, if it exists - fixes #271
+		if ($stickyTable.attr('id')) { $stickyTable[0].id += wo.stickyHeaders_cloneId; }
+		// clear out cloned table, except for sticky header
+		// include caption & filter row (fixes #126 & #249) - don't remove cells to get correct cell indexing
+		$stickyTable.find('thead:gt(0), tr.sticky-false').hide();
+		$stickyTable.find('tbody, tfoot').remove();
+		$stickyTable.find('caption').toggle(wo.stickyHeaders_includeCaption);
+		// issue #172 - find td/th in sticky header
+		$stickyCells = $stickyThead.children().children();
+		$stickyTable.css({ height:0, width:0, margin: 0 });
+		// remove resizable block
+		$stickyCells.find('.' + ts.css.resizer).remove();
+		// update sticky header class names to match real header after sorting
+		$table
+			.addClass('hasStickyHeaders')
+			.bind( $.trim('pagerComplete' + namespace), function() {
+				resizeHeader();
+			});
+
+		ts.bindEvents(table, $stickyThead.children().children('.tablesorter-header'));
+
+		// add stickyheaders AFTER the table. If the table is selected by ID, the original one (first) will be returned.
+		$table.after( $stickyWrap );
+
+		// onRenderHeader is defined, we need to do something about it (fixes #641)
+		if (c.onRenderHeader) {
+			$stickyThead.children('tr').children().each(function(index){
+				// send second parameter
+				c.onRenderHeader.apply( $(this), [ index, c, $stickyTable ] );
+			});
+		}
+
+		// make it sticky!
+		$xScroll.add($yScroll)
+		.unbind( $.trim('scroll resize '.split(' ').join( namespace )) )
+		.bind( $.trim('scroll resize '.split(' ').join( namespace )), function(event) {
+			if (!$table.is(':visible')) { return; } // fixes #278
+			// Detect nested tables - fixes #724
+			nestedStickyTop = $nestedSticky.length ? $nestedSticky.offset().top - $yScroll.scrollTop() + $nestedSticky.height() : 0;
+			var prefix = 'tablesorter-sticky-',
+				offset = $table.offset(),
+				yWindow = $.isWindow( $yScroll[0] ), // $.isWindow needs jQuery 1.4.3
+				xWindow = $.isWindow( $xScroll[0] ),
+				// scrollTop = ( $attach.length ? $attach.offset().top : $yScroll.scrollTop() ) + stickyOffset + nestedStickyTop,
+				scrollTop = ( $attach.length ? ( yWindow ? $yScroll.scrollTop() : $yScroll.offset().top ) : $yScroll.scrollTop() ) + stickyOffset + nestedStickyTop,
+				tableHeight = $table.height() - ($stickyWrap.height() + ($tfoot.height() || 0)),
+				isVisible = ( scrollTop > offset.top ) && ( scrollTop < offset.top + tableHeight ) ? 'visible' : 'hidden',
+				cssSettings = { visibility : isVisible };
+
+			if ($attach.length) {
+				cssSettings.top = yWindow ? scrollTop : $attach.scrollTop();
+			}
+			if (xWindow) {
+				// adjust when scrolling horizontally - fixes issue #143
+				cssSettings.left = $table.offset().left - parseInt($table.css('margin-left'), 10) - $xScroll.scrollLeft() - spacing;
+			}
+			if ($nestedSticky.length) {
+				cssSettings.top = ( cssSettings.top || 0 ) + stickyOffset + nestedStickyTop;
+			}
+			$stickyWrap
+				.removeClass(prefix + 'visible ' + prefix + 'hidden')
+				.addClass(prefix + isVisible)
+				.css(cssSettings);
+			if (isVisible !== laststate || event.type === 'resize') {
+				// make sure the column widths match
+				resizeHeader();
+				laststate = isVisible;
+			}
+		});
+		if (wo.stickyHeaders_addResizeEvent) {
+			ts.addHeaderResizeEvent(table);
+		}
+
+		// look for filter widget
+		if ($table.hasClass('hasFilters') && wo.filter_columnFilters) {
+			// scroll table into view after filtering, if sticky header is active - #482
+			$table.bind( $.trim('filterEnd' + namespace), function() {
+				// $(':focus') needs jQuery 1.6+
+				var $td = $(document.activeElement).closest('td'),
+					column = $td.parent().children().index($td);
+				// only scroll if sticky header is active
+				if ($stickyWrap.hasClass(ts.css.stickyVis) && wo.stickyHeaders_filteredToTop) {
+					// scroll to original table (not sticky clone)
+					window.scrollTo(0, $table.position().top);
+					// give same input/select focus; check if c.$filters exists; fixes #594
+					if (column >= 0 && c.$filters) {
+						c.$filters.eq(column).find('a, select, input').filter(':visible').focus();
+					}
+				}
+			});
+			ts.filter.bindSearch( $table, $stickyCells.find('.' + ts.css.filter) );
+			// support hideFilters
+			if (wo.filter_hideFilters) {
+				ts.filter.hideFilters($stickyTable, c);
+			}
+		}
+
+		$table.trigger('stickyHeadersInit');
+
+	},
+	remove: function(table, c, wo) {
+		var namespace = c.namespace + 'stickyheaders ';
+		c.$table
+			.removeClass('hasStickyHeaders')
+			.unbind( $.trim('pagerComplete filterEnd '.split(' ').join(namespace)) )
+			.next('.' + ts.css.stickyWrap).remove();
+		if (wo.$sticky && wo.$sticky.length) { wo.$sticky.remove(); } // remove cloned table
+		$(window)
+			.add(wo.stickyHeaders_xScroll)
+			.add(wo.stickyHeaders_yScroll)
+			.add(wo.stickyHeaders_attachTo)
+			.unbind( $.trim('scroll resize '.split(' ').join(namespace)) );
+		ts.addHeaderResizeEvent(table, false);
+	}
+});
+
+})(jQuery, window);
diff --git a/js/widgets/widget-storage.js b/js/widgets/widget-storage.js
new file mode 100644
index 00000000..12af34c8
--- /dev/null
+++ b/js/widgets/widget-storage.js
@@ -0,0 +1,76 @@
+/*! Widget: storage */
+;(function ($, window, document) {
+'use strict';
+
+var ts = $.tablesorter = $.tablesorter || {};
+// *** Store data in local storage, with a cookie fallback ***
+/* IE7 needs JSON library for JSON.stringify - (http://caniuse.com/#search=json)
+   if you need it, then include https://github.com/douglascrockford/JSON-js
+
+   $.parseJSON is not available is jQuery versions older than 1.4.1, using older
+   versions will only allow storing information for one page at a time
+
+   // *** Save data (JSON format only) ***
+   // val must be valid JSON... use http://jsonlint.com/ to ensure it is valid
+   var val = { "mywidget" : "data1" }; // valid JSON uses double quotes
+   // $.tablesorter.storage(table, key, val);
+   $.tablesorter.storage(table, 'tablesorter-mywidget', val);
+
+   // *** Get data: $.tablesorter.storage(table, key); ***
+   v = $.tablesorter.storage(table, 'tablesorter-mywidget');
+   // val may be empty, so also check for your data
+   val = (v && v.hasOwnProperty('mywidget')) ? v.mywidget : '';
+   alert(val); // "data1" if saved, or "" if not
+*/
+ts.storage = function(table, key, value, options) {
+	table = $(table)[0];
+	var cookieIndex, cookies, date,
+		hasLocalStorage = false,
+		values = {},
+		c = table.config,
+		$table = $(table),
+		id = options && options.id || $table.attr(options && options.group ||
+			'data-table-group') || table.id || $('.tablesorter').index( $table ),
+		url = options && options.url || $table.attr(options && options.page ||
+			'data-table-page') || c && c.fixedUrl || window.location.pathname;
+	// https://gist.github.com/paulirish/5558557
+	if ('localStorage' in window) {
+		try {
+			window.localStorage.setItem('_tmptest', 'temp');
+			hasLocalStorage = true;
+			window.localStorage.removeItem('_tmptest');
+		} catch(error) {}
+	}
+	// *** get value ***
+	if ($.parseJSON) {
+		if (hasLocalStorage) {
+			values = $.parseJSON(localStorage[key] || 'null') || {};
+		} else {
+			// old browser, using cookies
+			cookies = document.cookie.split(/[;\s|=]/);
+			// add one to get from the key to the value
+			cookieIndex = $.inArray(key, cookies) + 1;
+			values = (cookieIndex !== 0) ? $.parseJSON(cookies[cookieIndex] || 'null') || {} : {};
+		}
+	}
+	// allow value to be an empty string too
+	if ((value || value === '') && window.JSON && JSON.hasOwnProperty('stringify')) {
+		// add unique identifiers = url pathname > table ID/index on page > data
+		if (!values[url]) {
+			values[url] = {};
+		}
+		values[url][id] = value;
+		// *** set value ***
+		if (hasLocalStorage) {
+			localStorage[key] = JSON.stringify(values);
+		} else {
+			date = new Date();
+			date.setTime(date.getTime() + (31536e+6)); // 365 days
+			document.cookie = key + '=' + (JSON.stringify(values)).replace(/\"/g,'\"') + '; expires=' + date.toGMTString() + '; path=/';
+		}
+	} else {
+		return values && values[url] ? values[url][id] : '';
+	}
+};
+
+})(jQuery, window, document);
diff --git a/js/widgets/widget-uitheme.js b/js/widgets/widget-uitheme.js
new file mode 100644
index 00000000..90e046dd
--- /dev/null
+++ b/js/widgets/widget-uitheme.js
@@ -0,0 +1,184 @@
+/*! Widget: uitheme */
+;(function ($) {
+'use strict';
+var ts = $.tablesorter = $.tablesorter || {};
+
+ts.themes = {
+	'bootstrap' : {
+		table        : 'table table-bordered table-striped',
+		caption      : 'caption',
+		// header class names
+		header       : 'bootstrap-header', // give the header a gradient background (theme.bootstrap_2.css)
+		sortNone     : '',
+		sortAsc      : '',
+		sortDesc     : '',
+		active       : '', // applied when column is sorted
+		hover        : '', // custom css required - a defined bootstrap style may not override other classes
+		// icon class names
+		icons        : '', // add "icon-white" to make them white; this icon class is added to the <i> in the header
+		iconSortNone : 'bootstrap-icon-unsorted', // class name added to icon when column is not sorted
+		iconSortAsc  : 'icon-chevron-up glyphicon glyphicon-chevron-up', // class name added to icon when column has ascending sort
+		iconSortDesc : 'icon-chevron-down glyphicon glyphicon-chevron-down', // class name added to icon when column has descending sort
+		filterRow    : '', // filter row class
+		footerRow    : '',
+		footerCells  : '',
+		even         : '', // even row zebra striping
+		odd          : ''  // odd row zebra striping
+	},
+	'jui' : {
+		table        : 'ui-widget ui-widget-content ui-corner-all', // table classes
+		caption      : 'ui-widget-content',
+		// header class names
+		header       : 'ui-widget-header ui-corner-all ui-state-default', // header classes
+		sortNone     : '',
+		sortAsc      : '',
+		sortDesc     : '',
+		active       : 'ui-state-active', // applied when column is sorted
+		hover        : 'ui-state-hover',  // hover class
+		// icon class names
+		icons        : 'ui-icon', // icon class added to the <i> in the header
+		iconSortNone : 'ui-icon-carat-2-n-s', // class name added to icon when column is not sorted
+		iconSortAsc  : 'ui-icon-carat-1-n', // class name added to icon when column has ascending sort
+		iconSortDesc : 'ui-icon-carat-1-s', // class name added to icon when column has descending sort
+		filterRow    : '',
+		footerRow    : '',
+		footerCells  : '',
+		even         : 'ui-widget-content', // even row zebra striping
+		odd          : 'ui-state-default'   // odd row zebra striping
+	}
+};
+
+$.extend(ts.css, {
+	wrapper : 'tablesorter-wrapper' // ui theme & resizable
+});
+
+ts.addWidget({
+	id: "uitheme",
+	priority: 10,
+	format: function(table, c, wo) {
+		var i, hdr, icon, time, $header, $icon, $tfoot, $h, oldtheme, oldremove, oldIconRmv, hasOldTheme,
+			themesAll = ts.themes,
+			$table = c.$table.add( c.$extraTables ),
+			$headers = c.$headers.add( c.$extraHeaders ),
+			theme = c.theme || 'jui',
+			themes = themesAll[theme] || {},
+			remove = $.trim( [ themes.sortNone, themes.sortDesc, themes.sortAsc, themes.active ].join( ' ' ) ),
+			iconRmv = $.trim( [ themes.iconSortNone, themes.iconSortDesc, themes.iconSortAsc ].join( ' ' ) );
+		if (c.debug) { time = new Date(); }
+		// initialization code - run once
+		if (!$table.hasClass('tablesorter-' + theme) || c.theme !== c.appliedTheme || !wo.uitheme_applied) {
+			wo.uitheme_applied = true;
+			oldtheme = themesAll[c.appliedTheme] || {};
+			hasOldTheme = !$.isEmptyObject(oldtheme);
+			oldremove =  hasOldTheme ? [ oldtheme.sortNone, oldtheme.sortDesc, oldtheme.sortAsc, oldtheme.active ].join( ' ' ) : '';
+			oldIconRmv = hasOldTheme ? [ oldtheme.iconSortNone, oldtheme.iconSortDesc, oldtheme.iconSortAsc ].join( ' ' ) : '';
+			if (hasOldTheme) {
+				wo.zebra[0] = $.trim( ' ' + wo.zebra[0].replace(' ' + oldtheme.even, '') );
+				wo.zebra[1] = $.trim( ' ' + wo.zebra[1].replace(' ' + oldtheme.odd, '') );
+				c.$tbodies.children().removeClass( [oldtheme.even, oldtheme.odd].join(' ') );
+			}
+			// update zebra stripes
+			if (themes.even) { wo.zebra[0] += ' ' + themes.even; }
+			if (themes.odd) { wo.zebra[1] += ' ' + themes.odd; }
+			// add caption style
+			$table.children('caption')
+				.removeClass(oldtheme.caption || '')
+				.addClass(themes.caption);
+			// add table/footer class names
+			$tfoot = $table
+				// remove other selected themes
+				.removeClass( (c.appliedTheme ? 'tablesorter-' + (c.appliedTheme || '') : '') + ' ' + (oldtheme.table || '') )
+				.addClass('tablesorter-' + theme + ' ' + (themes.table || '')) // add theme widget class name
+				.children('tfoot');
+			c.appliedTheme = c.theme;
+
+			if ($tfoot.length) {
+				$tfoot
+					// if oldtheme.footerRow or oldtheme.footerCells are undefined, all class names are removed
+					.children('tr').removeClass(oldtheme.footerRow || '').addClass(themes.footerRow)
+					.children('th, td').removeClass(oldtheme.footerCells || '').addClass(themes.footerCells);
+			}
+			// update header classes
+			$headers
+				.removeClass( (hasOldTheme ? [oldtheme.header, oldtheme.hover, oldremove].join(' ') : '') || '' )
+				.addClass(themes.header)
+				.not('.sorter-false')
+				.unbind('mouseenter.tsuitheme mouseleave.tsuitheme')
+				.bind('mouseenter.tsuitheme mouseleave.tsuitheme', function(event) {
+					// toggleClass with switch added in jQuery 1.3
+					$(this)[ event.type === 'mouseenter' ? 'addClass' : 'removeClass' ](themes.hover || '');
+				});
+
+			$headers.each(function(){
+				var $this = $(this);
+				if (!$this.find('.' + ts.css.wrapper).length) {
+					// Firefox needs this inner div to position the icon & resizer correctly
+					$this.wrapInner('<div class="' + ts.css.wrapper + '" style="position:relative;height:100%;width:100%"></div>');
+				}
+			});
+			if (c.cssIcon) {
+				// if c.cssIcon is '', then no <i> is added to the header
+				$headers
+					.find('.' + ts.css.icon)
+					.removeClass(hasOldTheme ? [oldtheme.icons, oldIconRmv].join(' ') : '')
+					.addClass(themes.icons || '');
+			}
+			if ($table.hasClass('hasFilters')) {
+				$table.children('thead').children('.' + ts.css.filterRow)
+					.removeClass(hasOldTheme ? oldtheme.filterRow || '' : '')
+					.addClass(themes.filterRow || '');
+			}
+		}
+		for (i = 0; i < c.columns; i++) {
+			$header = c.$headers.add(c.$extraHeaders).not('.sorter-false').filter('[data-column="' + i + '"]');
+			$icon = (ts.css.icon) ? $header.find('.' + ts.css.icon) : $();
+			$h = $headers.not('.sorter-false').filter('[data-column="' + i + '"]:last');
+			if ($h.length) {
+				$header.removeClass(remove);
+				$icon.removeClass(iconRmv);
+				if ($h[0].sortDisabled) {
+					// no sort arrows for disabled columns!
+					$icon.removeClass(themes.icons || '');
+				} else {
+					hdr = themes.sortNone;
+					icon = themes.iconSortNone;
+					if ($h.hasClass(ts.css.sortAsc)) {
+						hdr = [themes.sortAsc, themes.active].join(' ');
+						icon = themes.iconSortAsc;
+					} else if ($h.hasClass(ts.css.sortDesc)) {
+						hdr = [themes.sortDesc, themes.active].join(' ');
+						icon = themes.iconSortDesc;
+					}
+					$h
+						.addClass(hdr)
+						.find('.' + ts.css.icon)
+						.addClass(icon || '');
+				}
+			}
+		}
+		if (c.debug) {
+			ts.benchmark("Applying " + theme + " theme", time);
+		}
+	},
+	remove: function(table, c, wo, refreshing) {
+		if (!wo.uitheme_applied) { return; }
+		var $table = c.$table,
+			theme = c.appliedTheme || 'jui',
+			themes = ts.themes[ theme ] || ts.themes.jui,
+			$headers = $table.children('thead').children(),
+			remove = themes.sortNone + ' ' + themes.sortDesc + ' ' + themes.sortAsc,
+			iconRmv = themes.iconSortNone + ' ' + themes.iconSortDesc + ' ' + themes.iconSortAsc;
+		$table.removeClass('tablesorter-' + theme + ' ' + themes.table);
+		wo.uitheme_applied = false;
+		if (refreshing) { return; }
+		$table.find(ts.css.header).removeClass(themes.header);
+		$headers
+			.unbind('mouseenter.tsuitheme mouseleave.tsuitheme') // remove hover
+			.removeClass(themes.hover + ' ' + remove + ' ' + themes.active)
+			.filter('.' + ts.css.filterRow)
+			.removeClass(themes.filterRow);
+		$headers.find('.' + ts.css.icon).removeClass(themes.icons + ' ' + iconRmv);
+	}
+});
+
+})(jQuery);
diff --git a/package.json b/package.json
index 88f8d8e5..b0377655 100644
--- a/package.json
+++ b/package.json
@@ -1,75 +1,85 @@
 {
-	"name": "tablesorter",
-	"title": "tablesorter",
-	"version": "2.19.1",
-	"description": "tablesorter is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.\n\nThis forked version adds lots of new enhancements including: alphanumeric sorting, pager callback functons, multiple widgets providing column styling, ui theme application, sticky headers, column filters and resizer, as well as extended documentation with a lot more demos.",
-	"author": {
-		"name": "Christian Bach",
-		"url": "http://tablesorter.com/"
-	},
-	"maintainers": [{
-		"name": "Rob Garrison",
-		"url": "https://github.com/Mottie",
-		"email": "wowmotty@gmail.com"
-	}],
-	"licenses": [{
-		"type": "MIT",
-		"url": "http://www.opensource.org/licenses/mit-license.php"
-	},{
-		"type": "GPL",
-		"url": "http://www.gnu.org/licenses/gpl.html"
-	}],
-	"homepage": "http://mottie.github.com/tablesorter/",
-	"bugs": "https://github.com/Mottie/tablesorter/issues",
-	"docs": "http://mottie.github.com/tablesorter/docs/index.html",
-	"demo": "https://github.com/Mottie/tablesorter/wiki",
-	"dependencies": {
-		"jquery": ">=1.2.6"
-	},
-	"keywords": [
-		"table",
-		"sort",
-		"sorting",
-		"alphanumeric",
-		"natural",
-		"jquery-plugin"
-	],
-	"main": "js/jquery.tablesorter.js",
-	"files": [
-		"css/theme.default.css",
-		"js/jquery.tablesorter.js",
-		"js/jquery.tablesorter.min.js",
-		"js/jquery.tablesorter.widgets.js",
-		"js/jquery.tablesorter.widgets.min.js",
-		"addons/pager/"
-	],
-	"repository": {
-		"type": "git",
-		"url": "git://github.com/Mottie/tablesorter.git"
-	},
-	"npmName": "tablesorter",
-	"npmFileMap": [{
-		"basePath": "",
-		"files": [
-			"js/*",
-			"js/**/*",
-			"css/*",
-			"css/images/*",
-			"addons/pager/*",
-			"addons/pager/icons/*"
-		]
-	}],
-	"autoupdate": {
-		"source": "git",
-		"target": "git://github.com/Mottie/tablesorter.git",
-		"basePath": "",
-		"files": [
-			"js/*",
-			"js/**/*",
-			"css/*",
-			"css/images/*",
-			"addons/pager/*",
-			"addons/pager/icons/*"
-		]
-	}
-}
\ No newline at end of file
+  "name": "tablesorter",
+  "title": "tablesorter",
+  "version": "2.19.1",
+  "description": "tablesorter is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.\n\nThis forked version adds lots of new enhancements including: alphanumeric sorting, pager callback functons, multiple widgets providing column styling, ui theme application, sticky headers, column filters and resizer, as well as extended documentation with a lot more demos.",
+  "author": {
+    "name": "Christian Bach",
+    "url": "http://tablesorter.com/"
+  },
+  "maintainers": [
+    {
+      "name": "Rob Garrison",
+      "url": "https://github.com/Mottie",
+      "email": "wowmotty@gmail.com"
+    }
+  ],
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "http://www.opensource.org/licenses/mit-license.php"
+    },
+    {
+      "type": "GPL",
+      "url": "http://www.gnu.org/licenses/gpl.html"
+    }
+  ],
+  "homepage": "http://mottie.github.com/tablesorter/",
+  "bugs": "https://github.com/Mottie/tablesorter/issues",
+  "docs": "http://mottie.github.com/tablesorter/docs/index.html",
+  "demo": "https://github.com/Mottie/tablesorter/wiki",
+  "dependencies": {
+    "jquery": ">=1.2.6"
+  },
+  "keywords": [
+    "table",
+    "sort",
+    "sorting",
+    "alphanumeric",
+    "natural",
+    "jquery-plugin"
+  ],
+  "main": "js/jquery.tablesorter.js",
+  "files": [
+    "dist/css/theme.default.css",
+    "dist/js/jquery.tablesorter.js",
+    "dist/js/jquery.tablesorter.min.js",
+    "dist/js/jquery.tablesorter.widgets.js",
+    "dist/js/jquery.tablesorter.widgets.min.js",
+    "dist/js/extras/jquery.tablesorter.pager.min.js"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/Mottie/tablesorter.git"
+  },
+  "npmName": "tablesorter",
+  "npmFileMap": [
+    {
+      "basePath": "",
+      "files": [
+        "dist/**/*"
+      ]
+    }
+  ],
+  "autoupdate": {
+    "source": "git",
+    "target": "git://github.com/Mottie/tablesorter.git",
+    "basePath": "",
+    "files": [
+      "dist/**/*"
+    ]
+  },
+  "devDependencies": {
+    "grunt": "^0.4.5",
+    "grunt-cli": "~0.1.13",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-concat": "^0.5.0",
+    "grunt-contrib-copy": "^0.7.0",
+    "grunt-contrib-cssmin": "^0.12.1",
+    "grunt-contrib-jshint": "^0.11.0",
+    "grunt-contrib-qunit": "^0.5.2",
+    "grunt-contrib-uglify": "^0.7.0",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-string-replace": "^1.0.0"
+  }
+}
diff --git a/tablesorter.jquery.json b/tablesorter.jquery.json
index e40b32f9..58c63183 100644
--- a/tablesorter.jquery.json
+++ b/tablesorter.jquery.json
@@ -1,44 +1,48 @@
 {
-	"name": "tablesorter",
-	"title": "tablesorter",
-	"version": "2.19.1",
-	"description": "tablesorter is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.\n\nThis forked version adds lots of new enhancements including: alphanumeric sorting, pager callback functons, multiple widgets providing column styling, ui theme application, sticky headers, column filters and resizer, as well as extended documentation with a lot more demos.",
-	"author": {
-		"name": "Christian Bach",
-		"url": "http://tablesorter.com/"
-	},
-	"maintainers": [{
-		"name": "Rob Garrison",
-		"url": "https://github.com/Mottie",
-		"email": "wowmotty@gmail.com"
-	}],
-	"licenses": [{
-		"type": "MIT",
-		"url": "http://www.opensource.org/licenses/mit-license.php"
-	},{
-		"type": "GPL",
-		"url": "http://www.gnu.org/licenses/gpl.html"
-	}],
-	"homepage": "http://mottie.github.com/tablesorter/",
-	"bugs": "https://github.com/Mottie/tablesorter/issues",
-	"docs": "http://mottie.github.com/tablesorter/docs/index.html",
-	"demo": "https://github.com/Mottie/tablesorter/wiki",
-	"dependencies": {
-		"jquery": ">=1.2.6"
-	},
-	"keywords": [
-		"table",
-		"sort",
-		"sorting",
-		"alphanumeric",
-		"natural",
-		"jquery-plugin"
-	],
-	"main": "js/tablesorter.js",
-	"files": [
-		"css/theme.default.css",
-		"js/jquery.tablesorter.min.js",
-		"js/jquery.tablesorter.widgets.min.js",
-		"addons/pager/"
-	]
+  "name": "tablesorter",
+  "title": "tablesorter",
+  "version": "2.19.1",
+  "description": "tablesorter is a jQuery plugin for turning a standard HTML table with THEAD and TBODY tags into a sortable table without page refreshes. tablesorter can successfully parse and sort many types of data including linked data in a cell.\n\nThis forked version adds lots of new enhancements including: alphanumeric sorting, pager callback functons, multiple widgets providing column styling, ui theme application, sticky headers, column filters and resizer, as well as extended documentation with a lot more demos.",
+  "author": {
+    "name": "Christian Bach",
+    "url": "http://tablesorter.com/"
+  },
+  "maintainers": [
+    {
+      "name": "Rob Garrison",
+      "url": "https://github.com/Mottie",
+      "email": "wowmotty@gmail.com"
+    }
+  ],
+  "licenses": [
+    {
+      "type": "MIT",
+      "url": "http://www.opensource.org/licenses/mit-license.php"
+    },
+    {
+      "type": "GPL",
+      "url": "http://www.gnu.org/licenses/gpl.html"
+    }
+  ],
+  "homepage": "http://mottie.github.com/tablesorter/",
+  "bugs": "https://github.com/Mottie/tablesorter/issues",
+  "docs": "http://mottie.github.com/tablesorter/docs/index.html",
+  "demo": "https://github.com/Mottie/tablesorter/wiki",
+  "dependencies": {
+    "jquery": ">=1.2.6"
+  },
+  "keywords": [
+    "table",
+    "sort",
+    "sorting",
+    "alphanumeric",
+    "natural",
+    "jquery-plugin"
+  ],
+  "main": "dist/js/jquery.tablesorter.js",
+  "files": [
+    "dist/css/theme.default.min.css",
+    "dist/js/jquery.tablesorter.min.js",
+    "dist/js/jquery.tablesorter.widgets.min.js"
+  ]
 }
\ No newline at end of file
diff --git a/test.html b/test.html
index 4dc55ec9..79bf23f1 100644
--- a/test.html
+++ b/test.html
@@ -11,7 +11,7 @@
 	<script src="js/jquery.tablesorter.js"></script>
 	<script src="js/jquery.tablesorter.widgets.js"></script>
 	<script src="js/parsers/parser-network.js"></script>
-	<script src="js/jquery.metadata.js"></script>
+	<script src="js/extras/jquery.metadata.js"></script>
 	<script src="testing/testing.js"></script>
 	<script src="testing/testing-ipv6.js"></script>
 	<script src="testing/testing-widgets.js"></script>
diff --git a/testing/testing.js b/testing/testing.js
index 1ef509e5..92f61ba0 100644
--- a/testing/testing.js
+++ b/testing/testing.js
@@ -625,6 +625,7 @@ $(function(){
 		tester.cacheCompare( table4, 3, [ 2, 1, 7, 6, 5, 3, 4, 8, 9, 10 ], 'force x2 + sorted x2 + append x2, ascending' );
 		$table4.on('sortEnd', function(){
 			count++;
+			console.log(count);
 			if (count === 1) {
 				tester.cacheCompare( table4, 3, [ 2, 1, 6, 7, 5, 4, 3, 8, 10, 9 ], 'force x2 + sorted x2 + append x2, descending' );
 				c4.sortResetKey = 'shiftKey';
@@ -632,9 +633,9 @@ $(function(){
 				e.which = 1;
 				e.shiftKey = true; // testing sortResetKey
 				c4.$headers.eq(0).trigger(e);
-			} else {
+			} else if (count === 2) {
 				tester.cacheCompare( table4, 3, [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], 'sortResetKey' );
-				$table4.off('sortEnd');
+				// $table4.off('sortEnd');
 				// start();
 			}
 		});