diff --git a/PetMe64.woff b/css/PetMe64.woff
similarity index 100%
rename from PetMe64.woff
rename to css/PetMe64.woff
diff --git a/index.html b/index.html
index 4c8728a..a932087 100644
--- a/index.html
+++ b/index.html
@@ -19,7 +19,7 @@
         <script type="text/javascript" src="js/lib/zip-fs.js"></script>
         <script type="text/javascript">
             window.onload = function() {
-                zip.workerScriptsPath = "lib/";
+                zip.workerScriptsPath = "js/lib/";
                 var defaults = {
                     respacks : ["./respacks/Defaults_v5.0.zip", 
                                 "./respacks/CharPackagev0.03.zip", 
diff --git a/js/HuesSettings.js b/js/HuesSettings.js
index 9ae12a1..61226ca 100644
--- a/js/HuesSettings.js
+++ b/js/HuesSettings.js
@@ -6,7 +6,7 @@ function HuesSettings(defaults) {
 HuesSettings.prototype.connectCore = function(core) {
     this.core = core;
 };
-
+/*
 //class HuesSettings
 package 
 {
@@ -385,3 +385,4 @@ package
 }
 
 
+*/
\ No newline at end of file
diff --git a/js/hues-modern.js b/js/hues-modern.js
new file mode 100644
index 0000000..1c3355f
--- /dev/null
+++ b/js/hues-modern.js
@@ -0,0 +1,42 @@
+Self.prototype.updateVolume = function(muted, gain) {
+    var label = this.volLabel
+    var input = this.volInput
+
+    var text = gain.toFixed(1) + "dB"
+    if (muted) {
+        text = "(" + text + ")"
+    }
+    label.textContent = text
+    input.value = gain
+}
+
+Self.prototype.setupVolume = function(box) {
+    var volBar = box.ownerDocument.createElement("div")
+    volBar.className = "hues-m-vol-bar"
+    box.appendChild(volBar)
+
+    var label = box.ownerDocument.createElement("button")
+    volBar.appendChild(label)
+    this.volLabel = label
+    label.addEventListener("click", (function() {
+        if (this.core.isMuted()) {
+            this.core.unmute()
+        } else {
+            this.core.mute()
+        }
+    }).bind(this))
+
+    var input = box.ownerDocument.createElement("input")
+    input.type = "range"
+    input.min = -60
+    input.max = 5
+    input.step = 1
+    volBar.appendChild(input)
+    this.volInput = input
+    input.addEventListener("input", (function() {
+        this.core.setVolume(parseFloat(input.value))
+    }).bind(this))
+
+    this.updateVolume(this.core.isMuted(), this.core.getVolume())
+    Hues.addEventListener("volumechange", this.updateVolume.bind(this))
+}
\ No newline at end of file
diff --git a/lib/.jshintrc b/js/lib/.jshintrc
similarity index 100%
rename from lib/.jshintrc
rename to js/lib/.jshintrc
diff --git a/lib/deflate.js b/js/lib/deflate.js
similarity index 100%
rename from lib/deflate.js
rename to js/lib/deflate.js
diff --git a/lib/inflate.js b/js/lib/inflate.js
similarity index 100%
rename from lib/inflate.js
rename to js/lib/inflate.js
diff --git a/lib/mime-types.js b/js/lib/mime-types.js
similarity index 100%
rename from lib/mime-types.js
rename to js/lib/mime-types.js
diff --git a/lib/pako/codecs.js b/js/lib/pako/codecs.js
similarity index 100%
rename from lib/pako/codecs.js
rename to js/lib/pako/codecs.js
diff --git a/lib/z-worker.js b/js/lib/z-worker.js
similarity index 100%
rename from lib/z-worker.js
rename to js/lib/z-worker.js
diff --git a/lib/zip-ext.js b/js/lib/zip-ext.js
similarity index 100%
rename from lib/zip-ext.js
rename to js/lib/zip-ext.js
diff --git a/lib/zip-fs.js b/js/lib/zip-fs.js
similarity index 100%
rename from lib/zip-fs.js
rename to js/lib/zip-fs.js
diff --git a/lib/zip.js b/js/lib/zip.js
similarity index 100%
rename from lib/zip.js
rename to js/lib/zip.js
diff --git a/lib/zlib-asm/codecs.js b/js/lib/zlib-asm/codecs.js
similarity index 100%
rename from lib/zlib-asm/codecs.js
rename to js/lib/zlib-asm/codecs.js