diff --git a/dist/ctrly.esm.js b/dist/ctrly.esm.js
index 7dd0b97..98775ee 100644
--- a/dist/ctrly.esm.js
+++ b/dist/ctrly.esm.js
@@ -1,5 +1,5 @@
 /*!
- * ctrly v0.5.0
+ * ctrly v0.6.0
  * Copyright (c) 2018 Jan Sorgalla
  * License: MIT
  */
@@ -50,14 +50,6 @@ function focus(element) {
   }
 }
 
-function find(selector, element) {
-  var context = arguments.length > 1 ? element : document;
-  if (!context || typeof context.querySelectorAll !== 'function') {
-    return [];
-  }
-  return [].slice.call(context.querySelectorAll(selector));
-}
-
 function matches(element, selector) {
   if (!element) {
     return false;
@@ -85,6 +77,72 @@ function closest(element, selector) {
   return null;
 }
 
+function find(selector, element) {
+  var context = arguments.length > 1 ? element : document;
+  if (!context || typeof context.querySelectorAll !== 'function') {
+    return [];
+  }
+  return [].slice.call(context.querySelectorAll(selector));
+}
+
+var selector = ['a[href]',
+'area[href]', 'input', 'select', 'textarea', 'button', 'iframe', 'object', 'audio[controls]', 'video[controls]', '[contenteditable]', '[tabindex]'].join(',');
+var inputNodeNameRegexp = /^(input|select|textarea|button|object)$/;
+function focusableFilter(element) {
+  var nodeName = element.nodeName.toLowerCase();
+  if (nodeName === 'area') {
+    return isValidArea(element);
+  }
+  if (element.disabled) {
+    return false;
+  }
+  if (inputNodeNameRegexp.test(nodeName)) {
+    var fieldset = closest(element, 'fieldset');
+    if (fieldset && fieldset.disabled) {
+      return false;
+    }
+  }
+  return visible(element);
+}
+function tabbableFilter(element) {
+  var index = tabIndex(element);
+  return focusableFilter(element) && index >= 0;
+}
+function compare(a, b) {
+  var aIndex = tabIndex(a, true);
+  var bIndex = tabIndex(b, true);
+  if (aIndex === bIndex) {
+    return a.compareDocumentPosition(b) & 2 ? 1 : -1;
+  }
+  return aIndex - bIndex;
+}
+function isValidArea(element) {
+  var map = element.parentNode;
+  var mapName = map.name;
+  if (!element.href || !mapName || map.nodeName.toLowerCase() !== 'map') {
+    return false;
+  }
+  var images = find("img[usemap=\"#".concat(mapName, "\"]"));
+  return images.length > 0 && visible(images[0]);
+}
+function visible(element) {
+  var style = getComputedStyle(element);
+  return (
+    style.visibility !== 'hidden' && style.visibility !== 'collapse' && style.display !== 'none' && parents(element).every(function (el) {
+      return getComputedStyle(el).display !== 'none';
+    })
+  );
+}
+function tabIndex(element) {
+  var positiveOnly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var index = parseInt(element.getAttribute('tabindex'), 10);
+  return isNaN(index) ? 0 : positiveOnly && index < 0 ? 0 : index;
+}
+
+function isTabbable(element) {
+  return matches(element, selector) && tabbableFilter(element);
+}
+
 var supportedOptions;
 function optionsSupport() {
   if (supportedOptions) {
@@ -219,60 +277,6 @@ function ready(listener) {
   }));
 }
 
-var selector = ['a[href]',
-'area[href]', 'input', 'select', 'textarea', 'button', 'iframe', 'object', 'audio[controls]', 'video[controls]', '[contenteditable]', '[tabindex]'].join(',');
-var inputNodeNameRegexp = /^(input|select|textarea|button|object)$/;
-function focusableFilter(element) {
-  var nodeName = element.nodeName.toLowerCase();
-  if (nodeName === 'area') {
-    return isValidArea(element);
-  }
-  if (element.disabled) {
-    return false;
-  }
-  if (inputNodeNameRegexp.test(nodeName)) {
-    var fieldset = closest(element, 'fieldset');
-    if (fieldset && fieldset.disabled) {
-      return false;
-    }
-  }
-  return visible(element);
-}
-function tabbableFilter(element) {
-  var index = tabIndex(element);
-  return focusableFilter(element) && index >= 0;
-}
-function compare(a, b) {
-  var aIndex = tabIndex(a, true);
-  var bIndex = tabIndex(b, true);
-  if (aIndex === bIndex) {
-    return a.compareDocumentPosition(b) & 2 ? 1 : -1;
-  }
-  return aIndex - bIndex;
-}
-function isValidArea(element) {
-  var map = element.parentNode;
-  var mapName = map.name;
-  if (!element.href || !mapName || map.nodeName.toLowerCase() !== 'map') {
-    return false;
-  }
-  var images = find("img[usemap=\"#".concat(mapName, "\"]"));
-  return images.length > 0 && visible(images[0]);
-}
-function visible(element) {
-  var style = getComputedStyle(element);
-  return (
-    style.visibility !== 'hidden' && style.visibility !== 'collapse' && style.display !== 'none' && parents(element).every(function (el) {
-      return getComputedStyle(el).display !== 'none';
-    })
-  );
-}
-function tabIndex(element) {
-  var positiveOnly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-  var index = parseInt(element.getAttribute('tabindex'), 10);
-  return isNaN(index) ? 0 : positiveOnly && index < 0 ? 0 : index;
-}
-
 function tabbable(element) {
   return find(selector, arguments.length > 0 ? element : document).filter(tabbableFilter).sort(compare);
 }
@@ -312,6 +316,7 @@ function findTarget(control) {
   return document.getElementById(control.getAttribute('aria-controls') || control.getAttribute('data-ctrly'));
 }
 function resetControl(control) {
+  control.removeAttribute('aria-pressed');
   control.removeAttribute('aria-controls');
   control.removeAttribute('aria-expanded');
 }
@@ -368,6 +373,9 @@ function ctrly() {
       destroy();
     }
     findControls(target).forEach(function (c) {
+      if (c.tagName.toLowerCase() !== 'button') {
+        c.setAttribute('aria-pressed', 'false');
+      }
       c.setAttribute('aria-expanded', 'false');
     });
     target.removeAttribute('data-ctrly-opened');
@@ -395,7 +403,9 @@ function ctrly() {
     if (options.closeOnBlur && !options.trapFocus) {
       removeFuncs.push(on(document, 'focusin', function (e) {
         if (!target.contains(e.target)) {
-          close(target, false);
+          setTimeout(function () {
+            close(target, false);
+          }, 0);
         }
       }, {
         capture: true,
@@ -494,6 +504,9 @@ function ctrly() {
       destroy: addEventListeners(control, target)
     };
     findControls(target).forEach(function (c) {
+      if (c.tagName.toLowerCase() !== 'button') {
+        c.setAttribute('aria-pressed', 'true');
+      }
       c.setAttribute('aria-expanded', 'true');
     });
     target.setAttribute('data-ctrly-opened', '');
@@ -502,38 +515,49 @@ function ctrly() {
     trigger(target, 'opened');
     return target;
   }
+  function toggle(e, control) {
+    var target = findTarget(control);
+    if (!target) {
+      if (close(findParentTarget(control))) {
+        e.preventDefault();
+      }
+      return;
+    }
+    if (control.getAttribute('aria-expanded') === 'true') {
+      if (close(target)) {
+        e.preventDefault();
+      }
+      return;
+    }
+    if (!options.allowMultiple) {
+      closeOthers(target);
+    }
+    open(control);
+    if (target) {
+      e.preventDefault();
+      if (options.focusTarget) {
+        focus(tabbable(target)[0] || target);
+      }
+      target.scrollTop = 0;
+      target.scrollLeft = 0;
+    }
+  }
   var removeControlClick;
+  var removeControlKeypress;
   function init() {
     if (!removeControlClick) {
       removeControlClick = delegate(document, 'click', controlSelector, function (e, control) {
-        if (keyCode(e) !== 1) {
-          return;
-        }
-        var target = findTarget(control);
-        if (!target) {
-          if (close(findParentTarget(control))) {
-            e.preventDefault();
+        if (keyCode(e) === 1
+        ) {
+            toggle(e, control);
           }
-          return;
-        }
-        if (control.getAttribute('aria-expanded') === 'true') {
-          if (close(target)) {
-            e.preventDefault();
-          }
-          return;
-        }
-        if (!options.allowMultiple) {
-          closeOthers(target);
-        }
-        open(control);
-        if (target) {
-          e.preventDefault();
-          if (options.focusTarget) {
-            focus(tabbable(target)[0] || target);
+      });
+      removeControlKeypress = delegate(document, 'keypress', controlSelector, function (e, control) {
+        if (keyCode(e) === 13
+        || keyCode(e) === 32
+        ) {
+            toggle(e, control);
           }
-          target.scrollTop = 0;
-          target.scrollLeft = 0;
-        }
       });
     }
     find(controlSelector).forEach(function (control) {
@@ -542,6 +566,14 @@ function ctrly() {
         resetControl(control);
         return;
       }
+      if (control.tagName.toLowerCase() !== 'button') {
+        if (!control.hasAttribute('role')) {
+          control.setAttribute('role', 'button');
+        }
+        if (!isTabbable(control)) {
+          control.setAttribute('tabindex', '0');
+        }
+      }
       control.setAttribute('aria-controls', target.id);
       var labelledBy = findControls(target).map(function (control) {
         if (!control.id) {
@@ -557,6 +589,9 @@ function ctrly() {
         open(control);
         return;
       }
+      if (control.tagName.toLowerCase() !== 'button') {
+        control.setAttribute('aria-pressed', 'false');
+      }
       control.setAttribute('aria-expanded', 'false');
       target.setAttribute('aria-hidden', 'true');
       target.removeAttribute('tabindex');
@@ -566,6 +601,8 @@ function ctrly() {
     if (fullReset && removeControlClick) {
       removeControlClick();
       removeControlClick = null;
+      removeControlKeypress();
+      removeControlKeypress = null;
     }
     find(controlSelector).forEach(function (control) {
       if (fullReset) {
diff --git a/dist/ctrly.js b/dist/ctrly.js
index 445e9be..73ad185 100644
--- a/dist/ctrly.js
+++ b/dist/ctrly.js
@@ -1,5 +1,5 @@
 /*!
- * ctrly v0.5.0
+ * ctrly v0.6.0
  * Copyright (c) 2018 Jan Sorgalla
  * License: MIT
  */
@@ -56,14 +56,6 @@
       }
     }
 
-    function find(selector, element) {
-      var context = arguments.length > 1 ? element : document;
-      if (!context || typeof context.querySelectorAll !== 'function') {
-        return [];
-      }
-      return [].slice.call(context.querySelectorAll(selector));
-    }
-
     function matches(element, selector) {
       if (!element) {
         return false;
@@ -91,6 +83,72 @@
       return null;
     }
 
+    function find(selector, element) {
+      var context = arguments.length > 1 ? element : document;
+      if (!context || typeof context.querySelectorAll !== 'function') {
+        return [];
+      }
+      return [].slice.call(context.querySelectorAll(selector));
+    }
+
+    var selector = ['a[href]',
+    'area[href]', 'input', 'select', 'textarea', 'button', 'iframe', 'object', 'audio[controls]', 'video[controls]', '[contenteditable]', '[tabindex]'].join(',');
+    var inputNodeNameRegexp = /^(input|select|textarea|button|object)$/;
+    function focusableFilter(element) {
+      var nodeName = element.nodeName.toLowerCase();
+      if (nodeName === 'area') {
+        return isValidArea(element);
+      }
+      if (element.disabled) {
+        return false;
+      }
+      if (inputNodeNameRegexp.test(nodeName)) {
+        var fieldset = closest(element, 'fieldset');
+        if (fieldset && fieldset.disabled) {
+          return false;
+        }
+      }
+      return visible(element);
+    }
+    function tabbableFilter(element) {
+      var index = tabIndex(element);
+      return focusableFilter(element) && index >= 0;
+    }
+    function compare(a, b) {
+      var aIndex = tabIndex(a, true);
+      var bIndex = tabIndex(b, true);
+      if (aIndex === bIndex) {
+        return a.compareDocumentPosition(b) & 2 ? 1 : -1;
+      }
+      return aIndex - bIndex;
+    }
+    function isValidArea(element) {
+      var map = element.parentNode;
+      var mapName = map.name;
+      if (!element.href || !mapName || map.nodeName.toLowerCase() !== 'map') {
+        return false;
+      }
+      var images = find("img[usemap=\"#".concat(mapName, "\"]"));
+      return images.length > 0 && visible(images[0]);
+    }
+    function visible(element) {
+      var style = getComputedStyle(element);
+      return (
+        style.visibility !== 'hidden' && style.visibility !== 'collapse' && style.display !== 'none' && parents(element).every(function (el) {
+          return getComputedStyle(el).display !== 'none';
+        })
+      );
+    }
+    function tabIndex(element) {
+      var positiveOnly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      var index = parseInt(element.getAttribute('tabindex'), 10);
+      return isNaN(index) ? 0 : positiveOnly && index < 0 ? 0 : index;
+    }
+
+    function isTabbable(element) {
+      return matches(element, selector) && tabbableFilter(element);
+    }
+
     var supportedOptions;
     function optionsSupport() {
       if (supportedOptions) {
@@ -225,60 +283,6 @@
       }));
     }
 
-    var selector = ['a[href]',
-    'area[href]', 'input', 'select', 'textarea', 'button', 'iframe', 'object', 'audio[controls]', 'video[controls]', '[contenteditable]', '[tabindex]'].join(',');
-    var inputNodeNameRegexp = /^(input|select|textarea|button|object)$/;
-    function focusableFilter(element) {
-      var nodeName = element.nodeName.toLowerCase();
-      if (nodeName === 'area') {
-        return isValidArea(element);
-      }
-      if (element.disabled) {
-        return false;
-      }
-      if (inputNodeNameRegexp.test(nodeName)) {
-        var fieldset = closest(element, 'fieldset');
-        if (fieldset && fieldset.disabled) {
-          return false;
-        }
-      }
-      return visible(element);
-    }
-    function tabbableFilter(element) {
-      var index = tabIndex(element);
-      return focusableFilter(element) && index >= 0;
-    }
-    function compare(a, b) {
-      var aIndex = tabIndex(a, true);
-      var bIndex = tabIndex(b, true);
-      if (aIndex === bIndex) {
-        return a.compareDocumentPosition(b) & 2 ? 1 : -1;
-      }
-      return aIndex - bIndex;
-    }
-    function isValidArea(element) {
-      var map = element.parentNode;
-      var mapName = map.name;
-      if (!element.href || !mapName || map.nodeName.toLowerCase() !== 'map') {
-        return false;
-      }
-      var images = find("img[usemap=\"#".concat(mapName, "\"]"));
-      return images.length > 0 && visible(images[0]);
-    }
-    function visible(element) {
-      var style = getComputedStyle(element);
-      return (
-        style.visibility !== 'hidden' && style.visibility !== 'collapse' && style.display !== 'none' && parents(element).every(function (el) {
-          return getComputedStyle(el).display !== 'none';
-        })
-      );
-    }
-    function tabIndex(element) {
-      var positiveOnly = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      var index = parseInt(element.getAttribute('tabindex'), 10);
-      return isNaN(index) ? 0 : positiveOnly && index < 0 ? 0 : index;
-    }
-
     function tabbable(element) {
       return find(selector, arguments.length > 0 ? element : document).filter(tabbableFilter).sort(compare);
     }
@@ -318,6 +322,7 @@
       return document.getElementById(control.getAttribute('aria-controls') || control.getAttribute('data-ctrly'));
     }
     function resetControl(control) {
+      control.removeAttribute('aria-pressed');
       control.removeAttribute('aria-controls');
       control.removeAttribute('aria-expanded');
     }
@@ -374,6 +379,9 @@
           destroy();
         }
         findControls(target).forEach(function (c) {
+          if (c.tagName.toLowerCase() !== 'button') {
+            c.setAttribute('aria-pressed', 'false');
+          }
           c.setAttribute('aria-expanded', 'false');
         });
         target.removeAttribute('data-ctrly-opened');
@@ -401,7 +409,9 @@
         if (options.closeOnBlur && !options.trapFocus) {
           removeFuncs.push(on(document, 'focusin', function (e) {
             if (!target.contains(e.target)) {
-              close(target, false);
+              setTimeout(function () {
+                close(target, false);
+              }, 0);
             }
           }, {
             capture: true,
@@ -500,6 +510,9 @@
           destroy: addEventListeners(control, target)
         };
         findControls(target).forEach(function (c) {
+          if (c.tagName.toLowerCase() !== 'button') {
+            c.setAttribute('aria-pressed', 'true');
+          }
           c.setAttribute('aria-expanded', 'true');
         });
         target.setAttribute('data-ctrly-opened', '');
@@ -508,38 +521,49 @@
         trigger(target, 'opened');
         return target;
       }
+      function toggle(e, control) {
+        var target = findTarget(control);
+        if (!target) {
+          if (close(findParentTarget(control))) {
+            e.preventDefault();
+          }
+          return;
+        }
+        if (control.getAttribute('aria-expanded') === 'true') {
+          if (close(target)) {
+            e.preventDefault();
+          }
+          return;
+        }
+        if (!options.allowMultiple) {
+          closeOthers(target);
+        }
+        open(control);
+        if (target) {
+          e.preventDefault();
+          if (options.focusTarget) {
+            focus(tabbable(target)[0] || target);
+          }
+          target.scrollTop = 0;
+          target.scrollLeft = 0;
+        }
+      }
       var removeControlClick;
+      var removeControlKeypress;
       function init() {
         if (!removeControlClick) {
           removeControlClick = delegate(document, 'click', controlSelector, function (e, control) {
-            if (keyCode(e) !== 1) {
-              return;
-            }
-            var target = findTarget(control);
-            if (!target) {
-              if (close(findParentTarget(control))) {
-                e.preventDefault();
+            if (keyCode(e) === 1
+            ) {
+                toggle(e, control);
               }
-              return;
-            }
-            if (control.getAttribute('aria-expanded') === 'true') {
-              if (close(target)) {
-                e.preventDefault();
-              }
-              return;
-            }
-            if (!options.allowMultiple) {
-              closeOthers(target);
-            }
-            open(control);
-            if (target) {
-              e.preventDefault();
-              if (options.focusTarget) {
-                focus(tabbable(target)[0] || target);
+          });
+          removeControlKeypress = delegate(document, 'keypress', controlSelector, function (e, control) {
+            if (keyCode(e) === 13
+            || keyCode(e) === 32
+            ) {
+                toggle(e, control);
               }
-              target.scrollTop = 0;
-              target.scrollLeft = 0;
-            }
           });
         }
         find(controlSelector).forEach(function (control) {
@@ -548,6 +572,14 @@
             resetControl(control);
             return;
           }
+          if (control.tagName.toLowerCase() !== 'button') {
+            if (!control.hasAttribute('role')) {
+              control.setAttribute('role', 'button');
+            }
+            if (!isTabbable(control)) {
+              control.setAttribute('tabindex', '0');
+            }
+          }
           control.setAttribute('aria-controls', target.id);
           var labelledBy = findControls(target).map(function (control) {
             if (!control.id) {
@@ -563,6 +595,9 @@
             open(control);
             return;
           }
+          if (control.tagName.toLowerCase() !== 'button') {
+            control.setAttribute('aria-pressed', 'false');
+          }
           control.setAttribute('aria-expanded', 'false');
           target.setAttribute('aria-hidden', 'true');
           target.removeAttribute('tabindex');
@@ -572,6 +607,8 @@
         if (fullReset && removeControlClick) {
           removeControlClick();
           removeControlClick = null;
+          removeControlKeypress();
+          removeControlKeypress = null;
         }
         find(controlSelector).forEach(function (control) {
           if (fullReset) {
diff --git a/dist/ctrly.min.js b/dist/ctrly.min.js
index 9889e8d..e9d904e 100644
--- a/dist/ctrly.min.js
+++ b/dist/ctrly.min.js
@@ -1,6 +1,6 @@
 /*!
- * ctrly v0.5.0
+ * ctrly v0.6.0
  * Copyright (c) 2018 Jan Sorgalla
  * License: MIT
  */
-!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.ctrly=t()}(this,function(){"use strict";function b(){try{var e=document.activeElement;return e&&e.nodeName?e:document.body}catch(e){return document.body}}function r(e){for(var t=[];e&&e.parentNode&&1===e.parentNode.nodeType;)e=e.parentNode,t.push(e);return t}function h(e){var t,n;(1<arguments.length&&void 0!==arguments[1]?arguments[1]:{}).restoreScrollPosition&&(n=r(e).map(function(e){return[e,e.scrollTop,e.scrollLeft]}),t=function(){n.forEach(function(e){e[0].scrollTop=e[1],e[0].scrollLeft=e[2]})});try{e.focus()}catch(e){}t&&t()}function m(e,t){var n=1<arguments.length?t:document;return n&&"function"==typeof n.querySelectorAll?[].slice.call(n.querySelectorAll(e)):[]}function n(e,t){if(!e)return!1;var n=e.matches||e.webkitMatchesSelector||e.msMatchesSelector;return"function"==typeof n&&n.call(e,t)}function y(e,t){if(!e)return null;if("function"==typeof e.closest)return e.closest(t);do{if(n(e,t))return e;e=e.parentNode}while(e&&1===e.nodeType);return null}var t;function a(){if(t)return t;t={capture:!1,once:!1,passive:!1};var e={get capture(){return!(t.capture=!0)},get once(){return!(t.once=!0)},get passive(){return!(t.passive=!0)}};return window.addEventListener("test",e,e),window.removeEventListener("test",e,e),t}function g(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},t=a(),n=t.once,r=t.passive,o=t.capture;return n||r||o?(n||delete e.once,r||delete e.passive,o||delete e.capture,e):Boolean(e.capture)}function A(t,e,n){var r=3<arguments.length&&void 0!==arguments[3]?arguments[3]:{capture:!1};if(!t||"function"!=typeof t.addEventListener)return function(){};var o=n,i=function(){!function(e,t,n){var r=3<arguments.length&&void 0!==arguments[3]?arguments[3]:{capture:!1};e&&"function"==typeof e.removeEventListener&&e.removeEventListener(t,n,g(r))}(t,e,o,r)};return r.once&&!a().once&&(o=function(e){i(),n.call(t,e)}),t.addEventListener(e,o,g(r)),i}var o=["a[href]","area[href]","input","select","textarea","button","iframe","object","audio[controls]","video[controls]","[contenteditable]","[tabindex]"].join(","),i=/^(input|select|textarea|button|object)$/;function u(e){var t=e.nodeName.toLowerCase();if("area"===t)return function(e){var t=e.parentNode,n=t.name;if(!e.href||!n||"map"!==t.nodeName.toLowerCase())return!1;var r=m('img[usemap="#'.concat(n,'"]'));return 0<r.length&&s(r[0])}(e);if(e.disabled)return!1;if(i.test(t)){var n=y(e,"fieldset");if(n&&n.disabled)return!1}return s(e)}function c(e){var t=d(e);return u(e)&&0<=t}function l(e,t){var n=d(e,!0),r=d(t,!0);return n===r?2&e.compareDocumentPosition(t)?1:-1:n-r}function s(e){var t=getComputedStyle(e);return"hidden"!==t.visibility&&"collapse"!==t.visibility&&"none"!==t.display&&r(e).every(function(e){return"none"!==getComputedStyle(e).display})}function d(e){var t=1<arguments.length&&void 0!==arguments[1]&&arguments[1],n=parseInt(e.getAttribute("tabindex"),10);return isNaN(n)?0:t&&n<0?0:n}function E(e){return m(o,0<arguments.length?e:document).filter(c).sort(l)}var w={selector:"[data-ctrly]",context:null,focusTarget:!0,closeOnBlur:!0,closeOnEsc:!0,closeOnOutsideClick:!0,closeOnScroll:!1,trapFocus:!1,allowMultiple:!1,on:null,autoInit:!0};function x(e){return"which"in e?e.which:e.keyCode}function O(e){return m('[aria-controls="'.concat(e.id,'"]'))}function L(e){return document.getElementById(e.getAttribute("aria-controls")||e.getAttribute("data-ctrly"))}function C(e){e.removeAttribute("aria-controls"),e.removeAttribute("aria-expanded")}var S=0;return function(){var n,t,e,r,o=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},a=(n={},[w,o].forEach(function(e){for(var t in e)Object.prototype.hasOwnProperty.call(e,t)&&(n[t]=e[t])}),n),u=a.selector,i=a.on||{},c={};function l(e,t){return("function"!=typeof i[t]||!1!==i[t](e))&&!1!==function(e,t){var n,r=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{};if(!e||"function"!=typeof e.dispatchEvent)return!0;r.bubbles=r.bubbles||!1,r.cancelable=r.cancelable||!1,r.composed=r.composed||!1,r.detail=r.detail||null;try{n=new CustomEvent(t,r)}catch(e){(n=document.createEvent("CustomEvent")).initCustomEvent(t,r.bubbles,r.cancelable,r.detail)}return e.dispatchEvent(n)}(e,"ctrly:".concat(t),{bubbles:!0,cancelable:!0})}function s(e){var t=!(1<arguments.length&&void 0!==arguments[1])||arguments[1];if(!e)return!1;if(!e.hasAttribute("data-ctrly-opened"))return!1;if(!l(e,"close"))return!1;var n=b(),r=c[e.id]||{},o=r.lastActiveElement,i=r.destroy;return delete c[e.id],i&&i(),O(e).forEach(function(e){e.setAttribute("aria-expanded","false")}),e.removeAttribute("data-ctrly-opened"),e.setAttribute("aria-hidden","true"),e.removeAttribute("tabindex"),e.blur(),t&&o&&e.contains(n)&&h(o,{restoreScrollPosition:!0}),l(e,"closed"),e}function d(n){var e;m(u,(e=n,a.context?y(e,a.context):document)).forEach(function(e){var t=L(e);t&&t.id!==n.id&&s(t,!1)})}function f(e){var t=L(e);return t?!t.hasAttribute("data-ctrly-opened")&&!!l(t,"open")&&(c[t.id]={lastActiveElement:b(),destroy:function(e,i){var t=[];if(a.closeOnBlur&&!a.trapFocus&&t.push(A(document,"focusin",function(e){i.contains(e.target)||s(i,!1)},{capture:!0,passive:!0})),a.closeOnEsc&&t.push(A(document,"keydown",function(e){27===x(e)&&s(i)&&e.preventDefault()})),a.closeOnOutsideClick&&t.push(A(document,"click",function(e){1!==x(e)||i.contains(e.target)||y(e.target,u)||s(i)},{passive:!0})),a.closeOnScroll){var n=!1,r=function(){n=!0},o=function(){n=!1};t.push(A(i,"mouseenter",r,{passive:!0})),t.push(A(i,"mouseleave",o,{passive:!0})),t.push(A(i,"touchstart",r,{passive:!0})),t.push(A(i,"touchend",o,{passive:!0})),t.push(A(window,"scroll",function(){n||s(i)},{passive:!0}))}return a.trapFocus&&t.push(A(document,"keydown",function(e){if(9===x(e)){var t=E(i);if(!t[0])return e.preventDefault(),void h(i);var n=b(),r=t[0],o=t[t.length-1];if(e.shiftKey&&n===r)return e.preventDefault(),void h(o);e.shiftKey||n!==o||(h(r),e.preventDefault())}})),function(){for(;t.length;)t.shift().call()}}(0,t)},O(t).forEach(function(e){e.setAttribute("aria-expanded","true")}),t.setAttribute("data-ctrly-opened",""),t.setAttribute("aria-hidden","false"),t.setAttribute("tabindex","-1"),l(t,"opened"),t):(C(e),!1)}function p(){t||(t=function(e,t,n,r){var o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:{capture:!1},i=!0===o.once;delete o.once;var a=A(e,t,function(e){var t=y(e.target,n);t&&(i&&a(),r.call(t,e,t))},o);return a}(document,"click",u,function(e,t){if(1===x(e)){var n=L(t);n?"true"!==t.getAttribute("aria-expanded")?(a.allowMultiple||d(n),f(t),n&&(e.preventDefault(),a.focusTarget&&h(E(n)[0]||n),n.scrollTop=0,n.scrollLeft=0)):s(n)&&e.preventDefault():s(function(e){for(var t=e;t;){if(t.id&&c[t.id])return t;t=t.parentElement}}(t))&&e.preventDefault()}})),m(u).forEach(function(e){var t=L(e);if(t){e.setAttribute("aria-controls",t.id);var n=O(t).map(function(e){return e.id||e.setAttribute("id","ctrly-control-"+ ++S),e.id}),r=(t.getAttribute("aria-labelledby")||"").split(" ").concat(n).filter(function(e,t,n){return""!==e&&n.indexOf(e)===t});t.setAttribute("aria-labelledby",r.join(" ")),"true"===e.getAttribute("aria-expanded")||e.hasAttribute("data-ctrly-open")?f(e):(e.setAttribute("aria-expanded","false"),t.setAttribute("aria-hidden","true"),t.removeAttribute("tabindex"))}else C(e)})}function v(n){for(var e in n&&t&&(t(),t=null),m(u).forEach(function(e){n&&C(e);var t=L(e);t&&(s(t,!1),n&&t.removeAttribute("aria-hidden"))}),c)Object.prototype.hasOwnProperty.call(c,e)&&(c[e].destroy(),delete c[e])}return a.autoInit&&(e=p,"complete"!==(r=document.readyState)&&"interactive"!==r?document.addEventListener("DOMContentLoaded",function(){e()},g({capture:!0,once:!0,passive:!0})):setTimeout(e,0)),{closeAll:function(){v(!1)},destroy:function(){v(!0)},init:p}}});
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.ctrly=e()}(this,function(){"use strict";function m(){try{var t=document.activeElement;return t&&t.nodeName?t:document.body}catch(t){return document.body}}function r(t){for(var e=[];t&&t.parentNode&&1===t.parentNode.nodeType;)t=t.parentNode,e.push(t);return e}function y(t){var e,n;(1<arguments.length&&void 0!==arguments[1]?arguments[1]:{}).restoreScrollPosition&&(n=r(t).map(function(t){return[t,t.scrollTop,t.scrollLeft]}),e=function(){n.forEach(function(t){t[0].scrollTop=t[1],t[0].scrollLeft=t[2]})});try{t.focus()}catch(t){}e&&e()}function A(t,e){if(!t)return!1;var n=t.matches||t.webkitMatchesSelector||t.msMatchesSelector;return"function"==typeof n&&n.call(t,e)}function g(t,e){if(!t)return null;if("function"==typeof t.closest)return t.closest(e);do{if(A(t,e))return t;t=t.parentNode}while(t&&1===t.nodeType);return null}function E(t,e){var n=1<arguments.length?e:document;return n&&"function"==typeof n.querySelectorAll?[].slice.call(n.querySelectorAll(t)):[]}var e,w=["a[href]","area[href]","input","select","textarea","button","iframe","object","audio[controls]","video[controls]","[contenteditable]","[tabindex]"].join(","),o=/^(input|select|textarea|button|object)$/;function n(t){var e=t.nodeName.toLowerCase();if("area"===e)return function(t){var e=t.parentNode,n=e.name;if(!t.href||!n||"map"!==e.nodeName.toLowerCase())return!1;var r=E('img[usemap="#'.concat(n,'"]'));return 0<r.length&&a(r[0])}(t);if(t.disabled)return!1;if(o.test(e)){var n=g(t,"fieldset");if(n&&n.disabled)return!1}return a(t)}function x(t){var e=u(t);return n(t)&&0<=e}function i(t,e){var n=u(t,!0),r=u(e,!0);return n===r?2&t.compareDocumentPosition(e)?1:-1:n-r}function a(t){var e=getComputedStyle(t);return"hidden"!==e.visibility&&"collapse"!==e.visibility&&"none"!==e.display&&r(t).every(function(t){return"none"!==getComputedStyle(t).display})}function u(t){var e=1<arguments.length&&void 0!==arguments[1]&&arguments[1],n=parseInt(t.getAttribute("tabindex"),10);return isNaN(n)?0:e&&n<0?0:n}function c(){if(e)return e;e={capture:!1,once:!1,passive:!1};var t={get capture(){return!(e.capture=!0)},get once(){return!(e.once=!0)},get passive(){return!(e.passive=!0)}};return window.addEventListener("test",t,t),window.removeEventListener("test",t,t),e}function L(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},e=c(),n=e.once,r=e.passive,o=e.capture;return n||r||o?(n||delete t.once,r||delete t.passive,o||delete t.capture,t):Boolean(t.capture)}function O(e,t,n){var r=3<arguments.length&&void 0!==arguments[3]?arguments[3]:{capture:!1};if(!e||"function"!=typeof e.addEventListener)return function(){};var o=n,i=function(){!function(t,e,n){var r=3<arguments.length&&void 0!==arguments[3]?arguments[3]:{capture:!1};t&&"function"==typeof t.removeEventListener&&t.removeEventListener(e,n,L(r))}(e,t,o,r)};return r.once&&!c().once&&(o=function(t){i(),n.call(e,t)}),e.addEventListener(t,o,L(r)),i}function C(t,e,n,r){var o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:{capture:!1},i=!0===o.once;delete o.once;var a=O(t,e,function(t){var e=g(t.target,n);e&&(i&&a(),r.call(e,t,e))},o);return a}function N(t){return E(w,0<arguments.length?t:document).filter(x).sort(i)}var S={selector:"[data-ctrly]",context:null,focusTarget:!0,closeOnBlur:!0,closeOnEsc:!0,closeOnOutsideClick:!0,closeOnScroll:!1,trapFocus:!1,allowMultiple:!1,on:null,autoInit:!0};function k(t){return"which"in t?t.which:t.keyCode}function D(t){return E('[aria-controls="'.concat(t.id,'"]'))}function T(t){return document.getElementById(t.getAttribute("aria-controls")||t.getAttribute("data-ctrly"))}function j(t){t.removeAttribute("aria-pressed"),t.removeAttribute("aria-controls"),t.removeAttribute("aria-expanded")}var M=0;return function(){var n,e,r,t,o,i=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},a=(n={},[S,i].forEach(function(t){for(var e in t)Object.prototype.hasOwnProperty.call(t,e)&&(n[e]=t[e])}),n),u=a.selector,c=a.on||{},l={};function s(t,e){return("function"!=typeof c[e]||!1!==c[e](t))&&!1!==function(t,e){var n,r=2<arguments.length&&void 0!==arguments[2]?arguments[2]:{};if(!t||"function"!=typeof t.dispatchEvent)return!0;r.bubbles=r.bubbles||!1,r.cancelable=r.cancelable||!1,r.composed=r.composed||!1,r.detail=r.detail||null;try{n=new CustomEvent(e,r)}catch(t){(n=document.createEvent("CustomEvent")).initCustomEvent(e,r.bubbles,r.cancelable,r.detail)}return t.dispatchEvent(n)}(t,"ctrly:".concat(e),{bubbles:!0,cancelable:!0})}function d(t){var e=!(1<arguments.length&&void 0!==arguments[1])||arguments[1];if(!t)return!1;if(!t.hasAttribute("data-ctrly-opened"))return!1;if(!s(t,"close"))return!1;var n=m(),r=l[t.id]||{},o=r.lastActiveElement,i=r.destroy;return delete l[t.id],i&&i(),D(t).forEach(function(t){"button"!==t.tagName.toLowerCase()&&t.setAttribute("aria-pressed","false"),t.setAttribute("aria-expanded","false")}),t.removeAttribute("data-ctrly-opened"),t.setAttribute("aria-hidden","true"),t.removeAttribute("tabindex"),t.blur(),e&&o&&t.contains(n)&&y(o,{restoreScrollPosition:!0}),s(t,"closed"),t}function f(n){var t;E(u,(t=n,a.context?g(t,a.context):document)).forEach(function(t){var e=T(t);e&&e.id!==n.id&&d(e,!1)})}function p(t){var e=T(t);return e?!e.hasAttribute("data-ctrly-opened")&&!!s(e,"open")&&(l[e.id]={lastActiveElement:m(),destroy:function(t,i){var e=[];if(a.closeOnBlur&&!a.trapFocus&&e.push(O(document,"focusin",function(t){i.contains(t.target)||setTimeout(function(){d(i,!1)},0)},{capture:!0,passive:!0})),a.closeOnEsc&&e.push(O(document,"keydown",function(t){27===k(t)&&d(i)&&t.preventDefault()})),a.closeOnOutsideClick&&e.push(O(document,"click",function(t){1!==k(t)||i.contains(t.target)||g(t.target,u)||d(i)},{passive:!0})),a.closeOnScroll){var n=!1,r=function(){n=!0},o=function(){n=!1};e.push(O(i,"mouseenter",r,{passive:!0})),e.push(O(i,"mouseleave",o,{passive:!0})),e.push(O(i,"touchstart",r,{passive:!0})),e.push(O(i,"touchend",o,{passive:!0})),e.push(O(window,"scroll",function(){n||d(i)},{passive:!0}))}return a.trapFocus&&e.push(O(document,"keydown",function(t){if(9===k(t)){var e=N(i);if(!e[0])return t.preventDefault(),void y(i);var n=m(),r=e[0],o=e[e.length-1];if(t.shiftKey&&n===r)return t.preventDefault(),void y(o);t.shiftKey||n!==o||(y(r),t.preventDefault())}})),function(){for(;e.length;)e.shift().call()}}(0,e)},D(e).forEach(function(t){"button"!==t.tagName.toLowerCase()&&t.setAttribute("aria-pressed","true"),t.setAttribute("aria-expanded","true")}),e.setAttribute("data-ctrly-opened",""),e.setAttribute("aria-hidden","false"),e.setAttribute("tabindex","-1"),s(e,"opened"),e):(j(t),!1)}function v(t,e){var n=T(e);n?"true"!==e.getAttribute("aria-expanded")?(a.allowMultiple||f(n),p(e),n&&(t.preventDefault(),a.focusTarget&&y(N(n)[0]||n),n.scrollTop=0,n.scrollLeft=0)):d(n)&&t.preventDefault():d(function(t){for(var e=t;e;){if(e.id&&l[e.id])return e;e=e.parentElement}}(e))&&t.preventDefault()}function b(){e||(e=C(document,"click",u,function(t,e){1===k(t)&&v(t,e)}),r=C(document,"keypress",u,function(t,e){13!==k(t)&&32!==k(t)||v(t,e)})),E(u).forEach(function(t){var e=T(t);if(e){var n;"button"!==t.tagName.toLowerCase()&&(t.hasAttribute("role")||t.setAttribute("role","button"),A(n=t,w)&&x(n)||t.setAttribute("tabindex","0")),t.setAttribute("aria-controls",e.id);var r=D(e).map(function(t){return t.id||t.setAttribute("id","ctrly-control-"+ ++M),t.id}),o=(e.getAttribute("aria-labelledby")||"").split(" ").concat(r).filter(function(t,e,n){return""!==t&&n.indexOf(t)===e});e.setAttribute("aria-labelledby",o.join(" ")),"true"===t.getAttribute("aria-expanded")||t.hasAttribute("data-ctrly-open")?p(t):("button"!==t.tagName.toLowerCase()&&t.setAttribute("aria-pressed","false"),t.setAttribute("aria-expanded","false"),e.setAttribute("aria-hidden","true"),e.removeAttribute("tabindex"))}else j(t)})}function h(n){for(var t in n&&e&&(e(),e=null,r(),r=null),E(u).forEach(function(t){n&&j(t);var e=T(t);e&&(d(e,!1),n&&e.removeAttribute("aria-hidden"))}),l)Object.prototype.hasOwnProperty.call(l,t)&&(l[t].destroy(),delete l[t])}return a.autoInit&&(t=b,"complete"!==(o=document.readyState)&&"interactive"!==o?document.addEventListener("DOMContentLoaded",function(){t()},L({capture:!0,once:!0,passive:!0})):setTimeout(t,0)),{closeAll:function(){h(!1)},destroy:function(){h(!0)},init:b}}});
diff --git a/package-lock.json b/package-lock.json
index 3237f1b..0649baa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "ctrly",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 56e28cb..8be0c52 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ctrly",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Lightweight and dependency-free content toggling with a focus on accessibility.",
   "repository": "git@github.com:jsor/ctrly.git",
   "author": {