diff --git a/content.js b/content.js
index d71029a379e073013ac51a9665732ce9f817a0ca..82cae17d37db07d0603de663ecf76ac56cc10b23 100644
--- a/content.js
+++ b/content.js
@@ -156,7 +156,7 @@ function midiEvent(type, data) {
         midiValue = data.value;
         templates = templateToDict(event['value']);
         templates.forEach(template => {
-            midiValue = midiValue * template['max'];
+            midiValue =(template['min'] + ((template['max']-template['min'])*midiValue));
             if (type == 'noteon' && template['eventType'] == 'noteon' && template['eventName'] == data.note.name) {
                 value = event['value'].replace('[' + template['templateFull'] + ']', midiValue);
                 let els = document.querySelectorAll(event['selector']);
@@ -430,21 +430,17 @@ function audioEvent() {
             if (min == 0) {
                 min = 1;
             }
-            if (template['eventType'] == 'energy' && template['eventName'] == 'bass') {
-                eventIn = true;
-                value = value.replace('[' + template['templateFull'] + ']', (energies['bass'] * min + (template['max'] - template['min'])));
-            }
-            if (template['eventType'] == 'energy' && template['eventName'] == 'mid') {
-                eventIn = true;
-                value = value.replace('[' + template['templateFull'] + ']', (energies['mid'] * min + (template['max'] - template['min'])));
-            }
-            if (template['eventType'] == 'energy' && template['eventName'] == 'treble') {
-                eventIn = true;
-                value = value.replace('[' + template['templateFull'] + ']', (energies['treble'] * min + (template['max'] - template['min'])));
-            }
+            Object.keys(presets).forEach(preset => {
+                if (template['eventType'] == 'energy' && template['eventName'] == preset) {
+                    eventIn = true;
+                    value = value.replace('[' + template['templateFull'] + ']', parseInt(template['min'])+Math.round((template['max']-template['min'])*energies[preset]));
+                }
+            });
             if (template['eventType'] == 'meter' && template['eventName'] == 'volume') {
                 eventIn = true;
-                value = value.replace('[' + template['templateFull'] + ']', (meter.volume * template['max']));
+                volume = meter.volume * 1.4;
+                // value = value.replace('[' + template['templateFull'] + ']', (template['max'] * meter.volume));
+                value = value.replace('[' + template['templateFull'] + ']', (meter.volume * 1.4<1?parseInt(template['min'])+Math.round((template['max']-template['min'])*volume):0));
             }
             if (event['value'].includes('[audio.noteon.' + noteStrings[note % 12] + ']')) {
                 eventIn = true;
@@ -457,7 +453,6 @@ function audioEvent() {
         });
         if (eventIn) {
             let els = document.querySelectorAll(event['selector']);
-            console.log(value);
             els.forEach(e => {
                 e.style[event['property']] = value;
             });