diff --git a/gulp/res/css/themes/chaos.css b/gulp/res/css/themes/chaos.css
new file mode 100644
index 00000000..c9d9f572
--- /dev/null
+++ b/gulp/res/css/themes/chaos.css
@@ -0,0 +1,65 @@
+:root {
+	--alt-label-color:#001010;
+	--alt-font-color:#00CCCC;
+	--background-top:#000505;
+	--background-rest:#000505;
+	--navbar-color:#001010;
+	--post-color:#001010;
+	--post-outline-color:#B7C5D9;
+	--label-color:#001010;
+	--box-border-color:#00AAAA;
+	--darken:#00000010;
+	--highlighted-post-color:#003030;
+	--highlighted-post-outline-color:#FF0000;
+	--board-title:#af0a0f;
+	--hr:lightgray;
+	--font-color:#00CCCC;
+	--name-color:#FF0000;
+	--capcode-color:#f00;
+	--subject-color:#FF0000;
+	--link-color:#FF0000;
+	--post-link-color:#FF0000;
+	--link-hover:#d00;
+	--input-borders:#00AAAA;
+	--input-color:#00CCCC;
+	--input-background:#000505;
+	--dice-color:darkorange;
+	--title-color:#d70000;
+	--greentext-color:#FF0000;
+}
+#float	.post-container,
+.catalog-tile,
+.live,
+.modal,
+.pages,
+.post-container,
+.stickynav,
+.toggle-summary,
+input[type=file],
+input[type=number],
+input[type=password],
+input[type=submit],
+input[type=text],
+select,
+textarea,
+.label,
+.postform-style,
+.close,
+table,
+#postform {
+	border:	1px	dotted;
+}
+hr {
+	border-top:	1px	dotted;
+}
+.navbar {
+	border-bottom:	1px	dotted;
+}
+#postform {
+	border-top:	none;
+}
+a .post-name:hover,
+a:hover {
+	background:var(--link-hover)!important;
+	color:black!important;
+}
diff --git a/gulp/res/js/hover.js b/gulp/res/js/hover.js
index fa1528ba..08a861ea 100644
--- a/gulp/res/js/hover.js
+++ b/gulp/res/js/hover.js
@@ -22,7 +22,7 @@ window.addEventListener('DOMContentLoaded', (event) => {
 		const top = e.getBoundingClientRect().top;
 		const bottom = e.getBoundingClientRect().bottom;
 		const height = window.innerHeight;
-		return top >= 0 && bottom <= height;
+		return top >= 38 && bottom <= height;
 	}
 
 	const setFloatPos = (float, xpos, ypos) => {
@@ -116,7 +116,8 @@ window.addEventListener('DOMContentLoaded', (event) => {
 					return localStorage.removeItem(`hovercache-${jsonPath}`); //thread deleted
 				}
 			}
-			if (!hovering || lastHover !== loading) {
+			if (lastHover !== loading) {
+//			if (!hovering && lastHover !== loading) {
 				return; //dont show for ones not hovering
 			}
 			if (threadJson.postId == hash) {
@@ -142,8 +143,9 @@ window.addEventListener('DOMContentLoaded', (event) => {
             window.dispatchEvent(newPostEvent);
 		}
 		toggleDottedUnderlines(hoveredPost, thisId);
+		hoveredPost.classList.remove('highlighted');
 		if (anchor && isVisible(hoveredPost)) {
-			hoveredPost.classList.toggle('highlighted');
+			hovering ? hoveredPost.classList.add('highlighted') : hoveredPost.classList.remove('highlighted');
 		} else if (hovering) {
 			floatPost(hoveredPost, e.clientX, e.clientY);
 		}
@@ -152,7 +154,7 @@ window.addEventListener('DOMContentLoaded', (event) => {
 	for (let i = 0; i < quotes.length; i++) {
 		quotes[i].addEventListener('mouseover', toggleHighlightPost, false);
 		quotes[i].addEventListener('mouseout', toggleHighlightPost, false);
-		quotes[i].addEventListener('mousemove', moveHighlightPost, false);
+//		quotes[i].addEventListener('mousemove', moveHighlightPost, false);
 	}
 
 	window.addEventListener('addPost', function(e) {
@@ -165,10 +167,10 @@ window.addEventListener('DOMContentLoaded', (event) => {
 		for (let i = 0; i < newquotes.length; i++) {
 			newquotes[i].removeEventListener('mouseover', toggleHighlightPost);
 			newquotes[i].removeEventListener('mouseout', toggleHighlightPost);
-			newquotes[i].removeEventListener('mousemove', moveHighlightPost);
+//			newquotes[i].removeEventListener('mousemove', moveHighlightPost);
 			newquotes[i].addEventListener('mouseover', toggleHighlightPost, false);
 			newquotes[i].addEventListener('mouseout', toggleHighlightPost, false);
-			newquotes[i].addEventListener('mousemove', moveHighlightPost, false);
+//			newquotes[i].addEventListener('mousemove', moveHighlightPost, false);
 		}
 	});
 
diff --git a/gulp/res/js/themelist.js b/gulp/res/js/themelist.js
index 1412e8a0..5c64c7c3 100644
--- a/gulp/res/js/themelist.js
+++ b/gulp/res/js/themelist.js
@@ -1 +1 @@
-const themes = ['choc', 'gurochan', 'lain', 'makaba', 'navy', 'rei-zero', 'sushi', 'tomorrow', 'yotsuba b', 'yotsuba'];const codeThemes = ['a11y-dark', 'a11y-light', 'agate', 'an-old-hope', 'androidstudio', 'arduino-light', 'arta', 'ascetic', 'atelier-cave-dark', 'atelier-cave-light', 'atelier-dune-dark', 'atelier-dune-light', 'atelier-estuary-dark', 'atelier-estuary-light', 'atelier-forest-dark', 'atelier-forest-light', 'atelier-heath-dark', 'atelier-heath-light', 'atelier-lakeside-dark', 'atelier-lakeside-light', 'atelier-plateau-dark', 'atelier-plateau-light', 'atelier-savanna-dark', 'atelier-savanna-light', 'atelier-seaside-dark', 'atelier-seaside-light', 'atelier-sulphurpool-dark', 'atelier-sulphurpool-light', 'atom-one-dark-reasonable', 'atom-one-dark', 'atom-one-light', 'brown-paper', 'brown-papersq', 'codepen-embed', 'color-brewer', 'darcula', 'dark', 'darkula', 'default', 'docco', 'dracula', 'far', 'foundation', 'github-gist', 'github', 'gml', 'googlecode', 'grayscale', 'gruvbox-dark', 'gruvbox-light', 'hopscotch', 'hybrid', 'idea', 'ir-black', 'isbl-editor-dark', 'isbl-editor-light', 'kimbie.dark', 'kimbie.light', 'lightfair', 'magula', 'mono-blue', 'monokai-sublime', 'monokai', 'night-owl', 'nord', 'obsidian', 'ocean', 'paraiso-dark', 'paraiso-light', 'pojoaque', 'pojoaque', 'purebasic', 'qtcreator_dark', 'qtcreator_light', 'railscasts', 'rainbow', 'routeros', 'school-book', 'school-book', 'shades-of-purple', 'solarized-dark', 'solarized-light', 'sunburst', 'tomorrow-night-blue', 'tomorrow-night-bright', 'tomorrow-night-eighties', 'tomorrow-night', 'tomorrow', 'vs', 'vs2015', 'xcode', 'xt256', 'zenburn']
\ No newline at end of file
+const themes = ['chaos', 'choc', 'gurochan', 'lain', 'makaba', 'navy', 'rei-zero', 'sushi', 'tomorrow', 'yotsuba b', 'yotsuba'];const codeThemes = ['a11y-dark', 'a11y-light', 'agate', 'an-old-hope', 'androidstudio', 'arduino-light', 'arta', 'ascetic', 'atelier-cave-dark', 'atelier-cave-light', 'atelier-dune-dark', 'atelier-dune-light', 'atelier-estuary-dark', 'atelier-estuary-light', 'atelier-forest-dark', 'atelier-forest-light', 'atelier-heath-dark', 'atelier-heath-light', 'atelier-lakeside-dark', 'atelier-lakeside-light', 'atelier-plateau-dark', 'atelier-plateau-light', 'atelier-savanna-dark', 'atelier-savanna-light', 'atelier-seaside-dark', 'atelier-seaside-light', 'atelier-sulphurpool-dark', 'atelier-sulphurpool-light', 'atom-one-dark-reasonable', 'atom-one-dark', 'atom-one-light', 'brown-paper', 'brown-papersq', 'codepen-embed', 'color-brewer', 'darcula', 'dark', 'darkula', 'default', 'docco', 'dracula', 'far', 'foundation', 'github-gist', 'github', 'gml', 'googlecode', 'grayscale', 'gruvbox-dark', 'gruvbox-light', 'hopscotch', 'hybrid', 'idea', 'ir-black', 'isbl-editor-dark', 'isbl-editor-light', 'kimbie.dark', 'kimbie.light', 'lightfair', 'magula', 'mono-blue', 'monokai-sublime', 'monokai', 'night-owl', 'nord', 'obsidian', 'ocean', 'paraiso-dark', 'paraiso-light', 'pojoaque', 'pojoaque', 'purebasic', 'qtcreator_dark', 'qtcreator_light', 'railscasts', 'rainbow', 'routeros', 'school-book', 'school-book', 'shades-of-purple', 'solarized-dark', 'solarized-light', 'sunburst', 'tomorrow-night-blue', 'tomorrow-night-bright', 'tomorrow-night-eighties', 'tomorrow-night', 'tomorrow', 'vs', 'vs2015', 'xcode', 'xt256', 'zenburn']
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index dd82fc96..8fb881c2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -182,10 +182,10 @@ function scripts() {
 			`!${paths.scripts.src}/hide.js`,
 		])
 		.pipe(concat('all.js'))
-//		.pipe(uglify())
+		.pipe(uglify())
 		.pipe(gulp.dest(paths.scripts.dest));
 	return gulp.src(`${paths.scripts.src}/*.js`)
-//		.pipe(uglify())
+		.pipe(uglify())
 		.pipe(gulp.dest(paths.scripts.dest));
 }
 
diff --git a/views/custompages/faq.pug b/views/custompages/faq.pug
index db0d61ad..20192a04 100644
--- a/views/custompages/faq.pug
+++ b/views/custompages/faq.pug
@@ -2,7 +2,7 @@ extends ../layout.pug
 include ../mixins/post.pug
 
 block head
-	script(src='/js/theme.js')
+	script(src='/js/all.js')
 	title Frequently Asked Questions
 
 block content
diff --git a/views/custompages/rules.pug b/views/custompages/rules.pug
index cce4f617..47261e9d 100644
--- a/views/custompages/rules.pug
+++ b/views/custompages/rules.pug
@@ -1,7 +1,7 @@
 extends ../layout.pug
 
 block head
-	script(src='/js/theme.js')
+	script(src='/js/all.js')
 	title Rules
 
 block content