diff --git a/content.js b/content.js
index bec3d584599205917e60f16a4960b40845eeb612..f61a5bfb22734faad33ca1fdb933307a51e69331 100644
--- a/content.js
+++ b/content.js
@@ -17,27 +17,33 @@ var audioSample = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
 function parseCSS(cssObj) {
     var parser = new CSSParser();
     var sheet = parser.parse(cssObj, false, true);
+    var audioVars = ['loud', 'low', 'lomi', 'mid', 'mihi', 'hi', 'attack'];
+    var midiVars = ['cc', 'note'];
     chrome.runtime.sendMessage({ type: 'updateUi', data: true });
     sheet.cssRules.forEach(element => {
         let els = document.querySelectorAll(element.mSelectorText);
         element.declarations.forEach(css => {
             els.forEach(e => {
-                if (css.valueText.includes('onset') || css.valueText.includes('onset') || css.valueText.includes('low') || css.valueText.includes('hi')|| css.valueText.includes('loud')) {
-                    audioEvents.push({
-                        'selector': element.mSelectorText,
-                        'property': css.property,
-                        'value': css.valueText
-                    })
-                }
-                if (css.valueText.includes('note') || css.valueText.includes('cc')) {
-                    midiEvents.push({
-                        'selector': element.mSelectorText,
-                        'property': css.property,
-                        'value': css.valueText
-                    })
-                }
-                else
-                    e.style[css.property] = css.valueText;
+                audioVars.forEach(audioVar => {
+                    if (css.valueText.includes(audioVar)) {
+                        audioEvents.push({
+                            'selector': element.mSelectorText,
+                            'property': css.property,
+                            'value': css.valueText,
+                            'templates': templateToDict(css.valueText)
+                        })
+                    }
+                });
+                midiVars.forEach(midiVar => {
+                    if (css.valueText.includes(midiVar)) {
+                        midiEvents.push({
+                            'selector': element.mSelectorText,
+                            'property': css.property,
+                            'value': css.valueText,
+                            'templates': templateToDict(css.valueText)
+                        })
+                    }
+                });
             });
         });
     });
@@ -432,9 +438,8 @@ function audioEvent() {
     }
     audioSample.shift();
     audioSample.push(meter.volume);
-    console.log(audioEvents);
     audioEvents.forEach(event => {
-        templates = templateToDict(event['value']);
+        templates = event['templates'];
         value = event['value'];
         eventIn = false;
         templates.forEach(template => {