diff --git a/build/cookieconsent.min.css b/build/cookieconsent.min.css
index 2137650b..7bb46e98 100644
--- a/build/cookieconsent.min.css
+++ b/build/cookieconsent.min.css
@@ -1,6 +1,6 @@
-.cc-window{opacity:1;transition:opacity .5s ease}.cc-window.cc-invisible{opacity:0}.cc-animate.cc-revoke{transition:transform 1s ease}.cc-animate.cc-revoke.cc-top{transform:translateY(-2em)}.cc-animate.cc-revoke.cc-bottom{transform:translateY(2em)}.cc-animate.cc-revoke.cc-active.cc-bottom,.cc-animate.cc-revoke.cc-active.cc-top,.cc-revoke:hover{transform:translateY(0)}
-.cc-link,.cc-revoke:hover{text-decoration:underline}.cc-revoke,.cc-window{position:fixed;overflow:hidden;box-sizing:border-box;font-family:Helvetica,Calibri,Arial,sans-serif;font-size:16px;line-height:1.5em;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap;z-index:9999}.cc-window.cc-floating{padding:2em;max-width:24em;-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner{padding:1em 1.8em;width:100%;-ms-flex-direction:row;flex-direction:row}.cc-revoke{padding:.5em}.cc-header{font-size:18px;font-weight:700}.cc-btn,.cc-close,.cc-link,.cc-revoke{cursor:pointer}.cc-link{opacity:.8;display:inline-block;padding:.2em}.cc-link:hover{opacity:1}.cc-link:active,.cc-link:visited{color:initial}.cc-btn{display:block;padding:.4em .8em;font-size:.9em;font-weight:700;border-width:2px;border-style:solid;text-align:center;white-space:nowrap}.cc-banner .cc-btn:last-child{min-width:140px}.cc-highlight .cc-btn:first-child{background-color:transparent;border-color:transparent}.cc-highlight .cc-btn:first-child:hover{background-color:transparent;text-decoration:underline}.cc-close{display:block;position:absolute;top:.5em;right:.5em;font-size:1.6em;opacity:.9;line-height:.75}.cc-close:hover{opacity:1}
+.cc-window{opacity:1;transition:opacity 1s ease}.cc-window.cc-invisible{opacity:0}.cc-animate.cc-revoke{transition:transform 1s ease}.cc-animate.cc-revoke.cc-top{transform:translateY(-2em)}.cc-animate.cc-revoke.cc-bottom{transform:translateY(2em)}.cc-animate.cc-revoke.cc-active.cc-bottom,.cc-animate.cc-revoke.cc-active.cc-top,.cc-revoke:hover{transform:translateY(0)}.cc-grower{max-height:0;overflow:hidden;transition:max-height 1s}
+.cc-link,.cc-revoke:hover{text-decoration:underline}.cc-revoke,.cc-window{position:fixed;overflow:hidden;box-sizing:border-box;font-family:Helvetica,Calibri,Arial,sans-serif;font-size:16px;line-height:1.5em;display:-ms-flexbox;display:flex;-ms-flex-wrap:nowrap;flex-wrap:nowrap;z-index:9999}.cc-window.cc-static{position:static}.cc-window.cc-floating{padding:2em;max-width:24em;-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner{padding:1em 1.8em;width:100%;-ms-flex-direction:row;flex-direction:row}.cc-revoke{padding:.5em}.cc-header{font-size:18px;font-weight:700}.cc-btn,.cc-close,.cc-link,.cc-revoke{cursor:pointer}.cc-link{opacity:.8;display:inline-block;padding:.2em}.cc-link:hover{opacity:1}.cc-link:active,.cc-link:visited{color:initial}.cc-btn{display:block;padding:.4em .8em;font-size:.9em;font-weight:700;border-width:2px;border-style:solid;text-align:center;white-space:nowrap}.cc-banner .cc-btn:last-child{min-width:140px}.cc-highlight .cc-btn:first-child{background-color:transparent;border-color:transparent}.cc-highlight .cc-btn:first-child:hover{background-color:transparent;text-decoration:underline}.cc-close{display:block;position:absolute;top:.5em;right:.5em;font-size:1.6em;opacity:.9;line-height:.75}.cc-close:hover{opacity:1}
 .cc-revoke.cc-top{top:0;left:3em;border-bottom-left-radius:.5em;border-bottom-right-radius:.5em}.cc-revoke.cc-bottom{bottom:0;left:3em;border-top-left-radius:.5em;border-top-right-radius:.5em}.cc-revoke.cc-left{left:3em;right:unset}.cc-revoke.cc-right{right:3em;left:unset}.cc-top{top:1em}.cc-left{left:1em}.cc-right{right:1em}.cc-bottom{bottom:1em}.cc-floating>.cc-link{margin-bottom:1em}.cc-floating .cc-message{display:block;margin-bottom:1em}.cc-window.cc-floating .cc-compliance{-ms-flex:1;flex:1}.cc-window.cc-banner{-ms-flex-align:center;-ms-grid-row-align:center;align-items:center}.cc-banner.cc-top{left:0;right:0;top:0}.cc-banner.cc-bottom{left:0;right:0;bottom:0}.cc-banner .cc-message{-ms-flex:1;flex:1}.cc-compliance{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:justify;align-content:space-between}.cc-compliance>.cc-btn{-ms-flex:1;flex:1}.cc-btn+.cc-btn{margin-left:.5em}
 @media print{.cc-revoke,.cc-window{display:none}}@media screen and (max-width:900px){.cc-btn{white-space:normal}}@media screen and (max-width:414px) and (orientation:portrait),screen and (max-width:736px) and (orientation:landscape){.cc-window.cc-top{top:0}.cc-window.cc-bottom{bottom:0}.cc-window.cc-banner,.cc-window.cc-left,.cc-window.cc-right{left:0;right:0}.cc-window.cc-banner{-ms-flex-direction:column;flex-direction:column}.cc-window.cc-banner .cc-compliance{-ms-flex:1;flex:1}.cc-window.cc-floating{max-width:none}.cc-window .cc-message{margin-bottom:1em}.cc-window.cc-banner{-ms-flex-align:unset;-ms-grid-row-align:unset;align-items:unset}}
-.cc-windowstyle-edgeless.cc-window{padding:0}.cc-floating.cc-windowstyle-edgeless .cc-message{margin:2em 2em 1.5em}.cc-banner.cc-windowstyle-edgeless .cc-btn{margin:0;padding:.8em 1.8em;height:100%}.cc-banner.cc-windowstyle-edgeless .cc-message{margin-left:1em}.cc-floating.cc-windowstyle-edgeless .cc-btn+.cc-btn{margin-left:0}.cc-floating.cc-windowstyle-classic{padding:1.2em;border-radius:5px}.cc-floating.cc-type-info.cc-windowstyle-classic .cc-compliance{text-align:center;display:inline;-ms-flex:none;flex:none}.cc-windowstyle-classic .cc-btn{border-radius:5px}.cc-windowstyle-classic .cc-btn:last-child{min-width:140px}.cc-floating.cc-type-info.cc-windowstyle-classic .cc-btn{display:inline-block}
-.cc-theme-centered-block.cc-window{text-align:center}
\ No newline at end of file
+.cc-floating.cc-theme-classic{padding:1.2em;border-radius:5px}.cc-floating.cc-type-info.cc-theme-classic .cc-compliance{text-align:center;display:inline;-ms-flex:none;flex:none}.cc-theme-classic .cc-btn{border-radius:5px}.cc-theme-classic .cc-btn:last-child{min-width:140px}.cc-floating.cc-type-info.cc-theme-classic .cc-btn{display:inline-block}
+.cc-theme-edgeless.cc-window{padding:0}.cc-floating.cc-theme-edgeless .cc-message{margin:2em 2em 1.5em}.cc-banner.cc-theme-edgeless .cc-btn{margin:0;padding:.8em 1.8em;height:100%}.cc-banner.cc-theme-edgeless .cc-message{margin-left:1em}.cc-floating.cc-theme-edgeless .cc-btn+.cc-btn{margin-left:0}
\ No newline at end of file
diff --git a/build/cookieconsent.min.js b/build/cookieconsent.min.js
index 979115f2..5ff58e41 100644
--- a/build/cookieconsent.min.js
+++ b/build/cookieconsent.min.js
@@ -1 +1 @@
-!function(e){if(!e.hasInitialised){var t={escapeRegExp:function(e){return e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},hasClass:function(e,t){var n=" ";return 1===e.nodeType&&(n+e.className+n).replace(/[\n\t]/g,n).indexOf(n+t+n)>=0},addClass:function(e,t){e.className+=" "+t},removeClass:function(e,n){var i=new RegExp("\\b"+t.escapeRegExp(n)+"\\b");e.className=e.className.replace(i,"")},interpolateString:function(e,t){var n=/{{([a-z][a-z0-9\-_]*)}}/gi;return e.replace(n,function(e){return t(arguments[1])||""})},getCookie:function(e){var t="; "+document.cookie,n=t.split("; "+e+"=");return 2!=n.length?void 0:n.pop().split(";").shift()},setCookie:function(e,t,n,i,o){var s=new Date;s.setDate(s.getDate()+(n||365));var a=[e+"="+t,"expires="+s.toUTCString(),"path="+(o||"/")];i&&a.push("domain="+i),document.cookie=a.join(";")},deepExtend:function(e,t){for(var n in t){var i=t[n];"object"==typeof i&&null!==i?(e[n]=e[n]||{},this.deepExtend(e[n],i)):e[n]=i}return e},throttle:function(e,t){var n=!1;return function(){n||(e.apply(this,arguments),n=!0,setTimeout(function(){n=!1},t))}},hash:function(e){var t,n,i,o=0;if(0===e.length)return o;for(t=0,i=e.length;t<i;t++)n=e.charCodeAt(t),o=(o<<5)-o+n,o|=0;return o},validateHex:function(e){return e=e.substr(1),e.length<6&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]),e},getContrast:function(e){e=t.validateHex(e);var n=parseInt(e.substr(0,2),16),i=parseInt(e.substr(2,2),16),o=parseInt(e.substr(4,2),16),s=(299*n+587*i+114*o)/1e3;return s>=128?"#000":"#fff"},getLuminance:function(e){if(e=t.validateHex(e),"000000"==e)return"#222";var n,i,o=.2,s="#";for(i=0;i<3;i++)n=parseInt(e.substr(2*i,2),16),n=Math.round(Math.min(Math.max(0,n+n*o),255)).toString(16),s+=("00"+n).substr(n.length);return s},getDirectory:function(){var e,t,n=document.getElementsByTagName("script");for(t=0;t<n.length;t++)if(e=n.item(t),e.src&&e.src.match(/cookieconsent.min.js$/))return e.src.slice(0,-"cookieconsent.min.js".length);return""},isMobile:function(){return!!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)}};e.status={deny:"deny",allow:"allow",dismiss:"dismiss"},e.hasTransition=function(){for(var e=document.documentElement.style,t=["t","OT","msT","MozT","KhtmlT","WebkitT"],n=0,i=t.length;n<i;++n)if(t[n]+"ransition"in e)return!0;return!1}(),e.transitionEnd="transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd";var n=Object.keys(e.status).map(t.escapeRegExp);e.customStyles={},e.Popup=function(){function i(){this.initialise.apply(this,arguments)}function o(e){this.openingTimeout=null,t.removeClass(e,"cc-invisible")}function s(e){e.style.display="none",e.removeEventListener("transitionend",this.afterTransition),this.afterTransition=null}function a(){var t=this.options.onStatusChange;if(!window.navigator.cookieEnabled)return t(e.status.deny),!0;if(window.CookiesOK||window.navigator.CookiesOK)return t(e.status.allow),!0;var n=Object.keys(e.status),i=this.getStatus(),o=n.indexOf(i)>=0;return o&&t(i),o}function r(){var e=this.options.position.split("-"),t=[];return e.forEach(function(e){t.push("cc-"+e)}),t}function c(){var e=this.options,t="top"==e.position||"bottom"==e.position?"banner":"floating",n=["cc-"+t,"cc-type-"+e.type,"cc-windowstyle-"+e.windowstyle];n.push.apply(n,r.call(this));d.call(this,this.options.palette);return this.customStyleSelector&&n.push(this.customStyleSelector),n}function l(){var e={},n=this.options;"false"==n.showlink&&(n.elements.link="",n.elements.messagelink=n.elements.message),Object.keys(n.elements).forEach(function(i){e[i]=t.interpolateString(n.elements[i],function(e){var t=n.content[e];return e&&"string"==typeof t&&t.length?t:""})});var i=n.compliance[n.type];i||(i=n.compliance.info),e.compliance=t.interpolateString(i,function(t){return e[t]});var o=n.layouts[n.layout];return o||(o=n.layouts.basic),t.interpolateString(o,function(t){return e[t]})}function h(e){var n=this.options,i=document.createElement("div"),o=n.container&&1===n.container.nodeType?n.container:document.body;i.innerHTML=e;var s=i.children[0];return s.style.display="none",t.hasClass(s,"cc-window")&&k.call(this)&&t.addClass(s,"cc-invisible"),this.onButtonClick=u.bind(this),s.addEventListener("click",this.onButtonClick),n.autoattach&&(o.firstChild?o.insertBefore(s,o.firstChild):o.appendChild(s)),s}function u(i){var o=i.target;if(t.hasClass(o,"cc-btn")){var s=o.className.match(new RegExp("\\bcc-("+n.join("|")+")\\b")),a=s&&s[1]||!1;a&&(this.setStatus(a),this.close(!0))}t.hasClass(o,"cc-close")&&(this.setStatus(e.status.dismiss),this.close(!0)),t.hasClass(o,"cc-revoke")&&(this.options.onRevokeChoice(),this.clearStatus(),this.open())}function d(e){var n=t.hash(JSON.stringify(e)),i="cc-color-override-"+n,o="object"==typeof e&&null!==e;return this.customStyleSelector=o?i:null,o&&p(n,e,"."+i),o}function p(n,i,o){if(e.customStyles[n])return void++e.customStyles[n].references;var s={},a=i.popup,r=i.button,c=i.highlight;a&&(a.text=a.text?a.text:t.getContrast(a.background),a.link=a.link?a.link:a.text,s[o+".cc-window"]=["color: "+a.text,"background-color: "+a.background],s[o+".cc-revoke"]=["color: "+a.text,"background-color: "+a.background],s[o+" .cc-link,"+o+" .cc-link:active,"+o+" .cc-link:visited"]=["color: "+a.link],r&&(r.text=r.text?r.text:t.getContrast(r.background),r.border=r.border?r.border:"transparent",s[o+" .cc-btn"]=["color: "+r.text,"border-color: "+r.border,"background-color: "+r.background],s[o+" .cc-btn:hover"]=["background-color: "+t.getLuminance(r.background)],c?(c.text=c.text?c.text:t.getContrast(c.background),c.border=c.border?c.border:"transparent",s[o+" .cc-highlight .cc-btn:first-child"]=["color: "+c.text,"border-color: "+c.border,"background-color: "+c.background]):s[o+" .cc-highlight .cc-btn:first-child"]=["color: "+a.text]));var l=document.createElement("style");document.head.appendChild(l),e.customStyles[n]={references:1,element:l.sheet};var h=-1;for(var u in s)l.sheet.insertRule(u+"{"+s[u].join(";")+"}",++h)}function m(n){if("object"==typeof n&&null!==n){var i=t.hash(JSON.stringify(n)),o=e.customStyles[i];if(o&&!--o.references){var s=o.element.ownerNode;s&&s.parentNode&&s.parentNode.removeChild(s),e.customStyles[i]=null}}}function f(e,t){for(var n=0,i=e.length;n<i;++n){var o=e[n];if(o instanceof RegExp&&o.test(t)||"string"==typeof o&&o.length&&o===t)return!0}return!1}function v(){var t=this.setStatus.bind(this),n=this.options.dismissOnTimeout;"number"==typeof n&&n>=0&&(this.dismissTimeout=window.setTimeout(function(){t(e.status.dismiss)},Math.floor(n)));var i=this.options.dismissOnScroll;if("number"==typeof i&&i>=0){var o=function(n){window.pageYOffset>Math.floor(i)&&(t(e.status.dismiss),window.removeEventListener("scroll",o),this.onWindowScroll=null)};this.onWindowScroll=o,window.addEventListener("scroll",o)}}function y(){if("info"!=this.options.type&&(this.options.revokable=!0),t.isMobile()&&(this.options.animateRevokable=!1),this.options.revokable){var e=r.call(this);this.options.animateRevokable&&e.push("cc-animate"),this.customStyleSelector&&e.push(this.customStyleSelector);var n=this.options.revokeBtn.replace("{{classes}}",e.join(" "));this.revokeBtn=h.call(this,n);var i=this.revokeBtn;if(this.options.animateRevokable){var o=t.throttle(function(e){var n=!1,o=20,s=window.innerHeight-20;t.hasClass(i,"cc-top")&&e.clientY<o&&(n=!0),t.hasClass(i,"cc-bottom")&&e.clientY>s&&(n=!0),n?t.hasClass(i,"cc-active")||t.addClass(i,"cc-active"):t.hasClass(i,"cc-active")&&t.removeClass(i,"cc-active")},200);this.onMouseMove=o,window.addEventListener("mousemove",o)}}}function g(e,t){var n=this,i=document.createElement("link"),o=function(e){return function(){t.apply(n,[e].concat(arguments))}};return i.rel="stylesheet",i.type="text/css",i.href=e,i.onload=o(!0),i.onerror=o(!1),document.head.appendChild(i),i}function b(e){if(this.options.pushdown){var t=document.getElementsByTagName("body")[0],n=document.getElementsByClassName("navbar-fixed-top")[0];0!=e?(document.getElementById("wpadminbar")&&(e-=32),k.call(this)&&(t.style.transition="all .4s linear .5s",n&&(n.style.transition="all .4s linear .5s"))):(t.style.transition="none",n&&(n.style.transition="none")),t.style.marginTop=e+"px",n&&(n.style.marginTop=e+"px")}}function k(){return this.options?this.options.transitions&&e.hasTransition:e.hasTransition}var w={cookie:{name:"cookieconsent_status",path:"/",domain:"",expiryDays:365},enabled:!0,container:null,autoattach:!0,stylesheet:t.getDirectory()+"cookieconsent.min.css",onPopupOpen:function(){},onPopupClose:function(){},onStatusChange:function(e){},onRevokeChoice:function(){},content:{header:"Cookies used on the website!",message:"This website uses cookies to ensure you get the best experience on our website.",dismiss:"Got it!",allow:"Allow cookies",deny:"Decline",link:"Learn more",href:"http://cookiesandyou.com",close:"&#x274c;"},showlink:!0,elements:{header:'<span class="cc-header">{{header}}</span>&nbsp;',message:'<span id="cookieconsent:desc" class="cc-message">{{message}}</span>',messagelink:'<span id="cookieconsent:desc" class="cc-message">{{message}} <a aria-label="learn more about cookies" tabindex="0" class="cc-link" href="{{href}}" target="_blank">{{link}}</a></span>',dismiss:'<a aria-label="dismiss cookie message" tabindex="0" class="cc-btn cc-dismiss">{{dismiss}}</a>',allow:'<a aria-label="allow cookies" tabindex="0" class="cc-btn cc-allow">{{allow}}</a>',deny:'<a aria-label="deny cookies" tabindex="0" class="cc-btn cc-deny">{{deny}}</a>',link:'<a aria-label="learn more about cookies" tabindex="0" class="cc-link" href="{{href}}" target="_blank">{{link}}</a>',close:'<span aria-label="dismiss cookie message" tabindex="0" class="cc-close">{{close}}</span>'},position:"bottom",type:"info",compliance:{info:'<div class="cc-compliance">{{dismiss}}</div>',"opt-in":'<div class="cc-compliance cc-highlight">{{dismiss}}{{allow}}</div>',"opt-out":'<div class="cc-compliance cc-highlight">{{deny}}{{dismiss}}</div>'},layout:"basic",layouts:{basic:"{{messagelink}}{{compliance}}","basic-close":"{{messagelink}}{{compliance}}{{close}}","basic-header":"{{header}}{{message}}{{link}}{{compliance}}"},pushdown:!0,transitions:!0,windowstyle:"block",window:'<div role="dialog" aria-label="cookieconsent" aria-describedby="cookieconsent:desc" class="cc-window {{classes}}">{{children}}</div>',revokeBtn:'<div class="cc-revoke {{classes}}">Cookie Policy</div>',revokable:!1,animateRevokable:!0,regionalLaw:!0,countryCode:null,dismissOnScroll:!1,dismissOnTimeout:!1,palette:null,whitelistPage:[],blacklistPage:[],overrideHTML:null};return i.prototype.initialise=function(n){this.options&&this.destroy(),this.waitingForStylesheet=!1,this.openAfterStylesheet=!1,this.requestedTheme=null,t.deepExtend(this.options={},w),"object"==typeof n&&null!==n&&t.deepExtend(this.options,n),a.call(this)&&(this.options.enabled=!1),f(this.options.blacklistPage,location.pathname)&&(this.options.enabled=!1),f(this.options.whitelistPage,location.pathname)&&(this.options.enabled=!0),this.options.stylesheet&&(this.waitingForStylesheet=!0,this.requestedTheme=g.call(this,this.options.stylesheet,function(e){this.waitingForStylesheet=!1,this.openAfterStylesheet&&(this.openAfterStylesheet=!1,this.open())}));var i=this.options.window.replace("{{classes}}",c.call(this).join(" ")).replace("{{children}}",l.call(this)),o=this.options.overrideHTML;return"string"==typeof o&&o.length&&(i=o),this.element=h.call(this,i),e.getCountryOptions(this.options),v.call(this),y.call(this),this},i.prototype.destroy=function(){if(this.onButtonClick&&this.element&&(this.element.removeEventListener("click",this.onButtonClick),this.onButtonClick=null),this.dismissTimeout&&(clearTimeout(this.dismissTimeout),this.dismissTimeout=null),this.onWindowScroll&&(window.removeEventListener("scroll",this.onWindowScroll),this.onWindowScroll=null),this.onMouseMove&&(window.removeEventListener("mousemove",this.onMouseMove),this.onMouseMove=null),this.element&&this.element.parentNode&&this.element.parentNode.removeChild(this.element),this.element=null,this.revokeBtn&&this.revokeBtn.parentNode&&this.revokeBtn.parentNode.removeChild(this.revokeBtn),this.revokeBtn=null,this.requestedTheme){var e=this.requestedTheme.ownerNode;e&&e.parentNode&&e.parentNode.removeChild(e)}this.requestedTheme=null,m(this.options.palette),this.options=null},i.prototype.open=function(e){return this.options.enabled?this.waitingForStylesheet?void(this.openAfterStylesheet=!0):(this.isOpen()||(k.call(this)?this.fadeIn():this.element.style.display="",this.options.revokable&&this.toggleRevokeButton(),this.options.onPopupOpen()),"top"==this.options.position&&b.call(this,this.element.offsetHeight),this):this},i.prototype.close=function(e){return this.options.enabled?(this.isOpen()&&(k.call(this)?this.fadeOut():this.element.style.display="none",e&&this.options.revokable&&this.toggleRevokeButton(!0),this.options.onPopupClose()),"top"==this.options.position&&b.call(this,0),this):this},i.prototype.fadeIn=function(){var e=this.element;k.call(this)&&(this.afterTransition&&s.call(this,e),t.hasClass(e,"cc-invisible")&&(e.style.display="",this.openingTimeout=setTimeout(o.bind(this,e),5)))},i.prototype.fadeOut=function(){var e=this.element;k.call(this)&&(this.openingTimeout&&(clearTimeout(this.openingTimeout),o.bind(this,e)),t.hasClass(e,"cc-invisible")||(this.afterTransition=s.bind(this,e),e.addEventListener("transitionend",this.afterTransition),t.addClass(e,"cc-invisible")))},i.prototype.isOpen=function(){return this.element&&""==this.element.style.display&&(!k.call(this)||!t.hasClass(this.element,"cc-invisible"))},i.prototype.toggleRevokeButton=function(e){this.revokeBtn&&(this.revokeBtn.style.display=e?"":"none")},i.prototype.setStatus=function(n){var i=this.options.cookie,o=t.getCookie(i.name),s=Object.keys(e.status).indexOf(o)>=0;Object.keys(e.status).indexOf(n)>=0?(t.setCookie(i.name,n,i.expiryDays,i.domain,i.path),this.options.onStatusChange(n,s)):this.clearStatus()},i.prototype.getStatus=function(){return t.getCookie(this.options.cookie.name)},i.prototype.clearStatus=function(){var e=this.options.cookie;t.setCookie(e.name,"",-1,e.domain,e.path)},i}(),e.law=function(){var e=["AT","BE","BG","HR","CZ","CY","DK","EE","FI","FR","DE","EL","HU","IE","IT","LV","LT","LU","MT","NL","PL","PT","SK","SI","ES","SE","GB","UK","GB"],t=["HR","CY","DK","EE","FR","DE","LV","LT","NL","PT","ES"],n=["HR","IT","ES"];return{get:function(i){return{hasLaw:e.indexOf(i)>=0,revokable:t.indexOf(i)>=0,explicitAction:n.indexOf(i)>=0}},applyLaw:function(e,t){var n=this.get(t);return n.hasLaw||(e.enabled=!1),1==e.regionalLaw&&(n.revokable&&(e.revokable=!0),n.explicitAction&&(e.dismissOnScroll=!1,e.dismissOnTimeout=!1)),e}}}(),e.locate=function(){function e(){var e=this.currentServiceIndex,n=this.locationServices[e];n&&t(n,o.bind(this))}function t(e,t){var i=this;if(e&&e.url&&e.callback){var o=e.isScript?a:r;o(e.url,function(o){var s=o?o.responseText:"";e.__JSONP_DATA&&(s=e.__JSONP_DATA,delete e.__JSONP_DATA),n.call(i,t,e,s)},e.data,e.headers)}}function n(e,t,n){var o=this,s=t.callback(function(t){s||i.call(o,e,t)},n);s&&i.call(this,e,s)}function i(e,t){t instanceof Error||t&&t.error?e.call(this,t,null):e.call(this,null,t)}function o(t,n){var i=this.currentServiceIndex,o=this.locationServices[i];t?(console.log("The service["+i+"] ("+o.url+") responded with the following error",t),this.locationServices[i+1]?(this.currentServiceIndex++,e.call(this)):s.call(this,null,new Error("All services failed"))):s.call(this,n,null)}function s(e,t){this.currentServiceIndex=0,this.onComplete(e,t)}function a(e,t){var n=document.createElement("script");n.type="text/"+(e.type||"javascript"),n.src=e.src||e,n.async=!1,n.onreadystatechange=n.onload=function(){var e=n.readyState;t.done||e&&!/loaded|complete/.test(e)||(t.done=!0,t(),n=null)},document.body.appendChild(n),n=null}function r(e,t,n,i){var o=new(window.XMLHttpRequest||window.ActiveXObject)("MSXML2.XMLHTTP.3.0");if(o.open(n?"POST":"GET",e,1),o.setRequestHeader("X-Requested-With","XMLHttpRequest"),o.setRequestHeader("Content-type","application/x-www-form-urlencoded"),Array.isArray(i))for(var s=0,a=i.length;s<a;++s){var r=i[s].split(":",2);o.setRequestHeader(r[0].replace(/^\s+|\s+$/g,""),r[1].replace(/^\s+|\s+$/g,""))}"function"==typeof t&&(o.onreadystatechange=function(){o.readyState>3&&t(o)}),o.send(n)}function c(e){return new Error("Error ["+(e.code||"UNKNOWN")+"]: "+e.error)}return{currentServiceIndex:0,locationServices:[{url:"http://ipinfo.io",headers:["Accept: application/json"],callback:function(e,t){var n=JSON.parse(t);return n.error?c(n):{code:n.country}}},{url:"http://freegeoip.net/json/?callback=cookieconsent.locate.jsonp(1)",isScript:!0,callback:function(e,t){var n=JSON.parse(t);return n.error?c(n):{code:n.country_code}}},{url:"http://js.maxmind.com/js/apis/geoip2/v2.1/geoip2.js",isScript:!0,callback:function(e){return window.geoip2?void geoip2.country(function(t){e({code:t.country.iso_code})},function(t){e(c(t))}):void e(new Error("Unexpected response format. The downloaded script should have exported `geoip2` to the global scope"))}}],init:function(t,n){this.onComplete=t,"[object Array]"==Object.prototype.toString.call(n)&&(this.locationServices=this.locationServices.concat(n)),e.call(this)},jsonp:function(e){var t=this.locationServices[e];return function(e){t.__JSONP_DATA=JSON.stringify(e)}}}}(),e.factory=function(t){return popup=new e.Popup(t),popup},e.getCountryOptions=function(t){t.countryCode?e.law.applyLaw(t,t.countryCode):e.locate.init(function(n){e.law.applyLaw(t,n.code)})},e.autoOpen=function(t){var n=e.factory(t),i=n.getStatus();return Object.keys(e.status).indexOf(i)<0&&n.options.enabled&&n.open(),n},e.utils=t,e.hasInitialised=!0,window.cookieconsent=e}}(window.cookieconsent||{});
\ No newline at end of file
+!function(e){if(!e.hasInitialised){var t={escapeRegExp:function(e){return e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},hasClass:function(e,t){var i=" ";return 1===e.nodeType&&(i+e.className+i).replace(/[\n\t]/g,i).indexOf(i+t+i)>=0},addClass:function(e,t){e.className+=" "+t},removeClass:function(e,t){var i=new RegExp("\\b"+this.escapeRegExp(t)+"\\b");e.className=e.className.replace(i,"")},interpolateString:function(e,t){var i=/{{([a-z][a-z0-9\-_]*)}}/gi;return e.replace(i,function(e){return t(arguments[1])||""})},getCookie:function(e){var t="; "+document.cookie,i=t.split("; "+e+"=");return 2!=i.length?void 0:i.pop().split(";").shift()},setCookie:function(e,t,i,n,o){var s=new Date;s.setDate(s.getDate()+(i||365));var r=[e+"="+t,"expires="+s.toUTCString(),"path="+(o||"/")];n&&r.push("domain="+n),document.cookie=r.join(";")},deepExtend:function(e,t){for(var i in t)t.hasOwnProperty(i)&&(i in e&&this.isPlainObject(e[i])&&this.isPlainObject(t[i])?this.deepExtend(e[i],t[i]):e[i]=t[i]);return e},throttle:function(e,t){var i=!1;return function(){i||(e.apply(this,arguments),i=!0,setTimeout(function(){i=!1},t))}},hash:function(e){var t,i,n,o=0;if(0===e.length)return o;for(t=0,n=e.length;t<n;++t)i=e.charCodeAt(t),o=(o<<5)-o+i,o|=0;return o},normaliseHex:function(e){return"#"==e[0]&&(e=e.substr(1)),3==e.length&&(e=e[0]+e[0]+e[1]+e[1]+e[2]+e[2]),e},getContrast:function(e){e=this.normaliseHex(e);var t=parseInt(e.substr(0,2),16),i=parseInt(e.substr(2,2),16),n=parseInt(e.substr(4,2),16),o=(299*t+587*i+114*n)/1e3;return o>=128?"#000":"#fff"},getLuminance:function(e){var t=parseInt(this.normaliseHex(e),16),i=38,n=(t>>16)+i,o=(t>>8&255)+i,s=(255&t)+i,r=(16777216+65536*(n<255?n<1?0:n:255)+256*(o<255?o<1?0:o:255)+(s<255?s<1?0:s:255)).toString(16).slice(1);return"#"+r},isMobile:function(){return/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)},isPlainObject:function(e){return"object"==typeof e&&null!==e&&e.constructor==Object}};e.status={deny:"deny",allow:"allow",dismiss:"dismiss"},e.transitionEnd=function(){var e=document.createElement("div"),t={t:"transitionend",OT:"oTransitionEnd",msT:"MSTransitionEnd",MozT:"transitionend",WebkitT:"webkitTransitionEnd"};for(var i in t)if(t.hasOwnProperty(i)&&"undefined"!=typeof e.style[i+"ransition"])return t[i];return""}(),e.hasTransition=!!e.transitionEnd;var i=Object.keys(e.status).map(t.escapeRegExp);e.customStyles={},e.Popup=function(){function n(){this.initialise.apply(this,arguments)}function o(e){this.openingTimeout=null,t.removeClass(e,"cc-invisible")}function s(t){t.style.display="none",t.removeEventListener(e.transitionEnd,this.afterTransition),this.afterTransition=null}function r(){var t=this.options.onInitialise.bind(this);if(!window.navigator.cookieEnabled)return t(e.status.deny),!0;if(window.CookiesOK||window.navigator.CookiesOK)return t(e.status.allow),!0;var i=Object.keys(e.status),n=this.getStatus(),o=i.indexOf(n)>=0;return o&&t(n),o}function a(){var e=this.options.position.split("-"),t=[];return e.forEach(function(e){t.push("cc-"+e)}),t}function c(){var e=this.options,i="top"==e.position||"bottom"==e.position?"banner":"floating";t.isMobile()&&(i="floating");var n=["cc-"+i,"cc-type-"+e.type,"cc-theme-"+e.theme];e["static"]&&n.push("cc-static"),n.push.apply(n,a.call(this));p.call(this,this.options.palette);return this.customStyleSelector&&n.push(this.customStyleSelector),n}function l(){var e={},i=this.options;i.showLink||(i.elements.link="",i.elements.messagelink=i.elements.message),Object.keys(i.elements).forEach(function(n){e[n]=t.interpolateString(i.elements[n],function(e){var t=i.content[e];return e&&"string"==typeof t&&t.length?t:""})});var n=i.compliance[i.type];n||(n=i.compliance.info),e.compliance=t.interpolateString(n,function(t){return e[t]});var o=i.layouts[i.layout];return o||(o=i.layouts.basic),t.interpolateString(o,function(t){return e[t]})}function u(i){var n=this.options,o=document.createElement("div"),s=n.container&&1===n.container.nodeType?n.container:document.body;o.innerHTML=i;var r=o.children[0];return r.style.display="none",t.hasClass(r,"cc-window")&&e.hasTransition&&t.addClass(r,"cc-invisible"),this.onButtonClick=h.bind(this),r.addEventListener("click",this.onButtonClick),n.autoAttach&&(s.firstChild?s.insertBefore(r,s.firstChild):s.appendChild(r)),r}function h(n){var o=n.target;if(t.hasClass(o,"cc-btn")){var s=o.className.match(new RegExp("\\bcc-("+i.join("|")+")\\b")),r=s&&s[1]||!1;r&&(this.setStatus(r),this.close(!0))}t.hasClass(o,"cc-close")&&(this.setStatus(e.status.dismiss),this.close(!0)),t.hasClass(o,"cc-revoke")&&this.revokeChoice()}function p(e){var i=t.hash(JSON.stringify(e)),n="cc-color-override-"+i,o=t.isPlainObject(e);return this.customStyleSelector=o?n:null,o&&d(i,e,"."+n),o}function d(i,n,o){if(e.customStyles[i])return void++e.customStyles[i].references;var s={},r=n.popup,a=n.button,c=n.highlight;r&&(r.text=r.text?r.text:t.getContrast(r.background),r.link=r.link?r.link:r.text,s[o+".cc-window"]=["color: "+r.text,"background-color: "+r.background],s[o+".cc-revoke"]=["color: "+r.text,"background-color: "+r.background],s[o+" .cc-link,"+o+" .cc-link:active,"+o+" .cc-link:visited"]=["color: "+r.link],a&&(a.text=a.text?a.text:t.getContrast(a.background),a.border=a.border?a.border:"transparent",s[o+" .cc-btn"]=["color: "+a.text,"border-color: "+a.border,"background-color: "+a.background],"transparent"!=a.background&&(s[o+" .cc-btn:hover"]=["background-color: "+v(a.background)]),c?(c.text=c.text?c.text:t.getContrast(c.background),c.border=c.border?c.border:"transparent",s[o+" .cc-highlight .cc-btn:first-child"]=["color: "+c.text,"border-color: "+c.border,"background-color: "+c.background]):s[o+" .cc-highlight .cc-btn:first-child"]=["color: "+r.text]));var l=document.createElement("style");document.head.appendChild(l),e.customStyles[i]={references:1,element:l.sheet};var u=-1;for(var h in s)s.hasOwnProperty(h)&&l.sheet.insertRule(h+"{"+s[h].join(";")+"}",++u)}function v(e){return e=t.normaliseHex(e),"000000"==e?"#222":t.getLuminance(e)}function f(i){if(t.isPlainObject(i)){var n=t.hash(JSON.stringify(i)),o=e.customStyles[n];if(o&&!--o.references){var s=o.element.ownerNode;s&&s.parentNode&&s.parentNode.removeChild(s),e.customStyles[n]=null}}}function m(e,t){for(var i=0,n=e.length;i<n;++i){var o=e[i];if(o instanceof RegExp&&o.test(t)||"string"==typeof o&&o.length&&o===t)return!0}return!1}function b(){var t=this.setStatus.bind(this),i=this.options.dismissOnTimeout;"number"==typeof i&&i>=0&&(this.dismissTimeout=window.setTimeout(function(){t(e.status.dismiss)},Math.floor(i)));var n=this.options.dismissOnScroll;if("number"==typeof n&&n>=0){var o=function(i){window.pageYOffset>Math.floor(n)&&(t(e.status.dismiss),window.removeEventListener("scroll",o),this.onWindowScroll=null)};this.onWindowScroll=o,window.addEventListener("scroll",o)}}function y(){if("info"!=this.options.type&&(this.options.revokable=!0),t.isMobile()&&(this.options.animateRevokable=!1),this.options.revokable){var e=a.call(this);this.options.animateRevokable&&e.push("cc-animate"),this.customStyleSelector&&e.push(this.customStyleSelector);var i=this.options.revokeBtn.replace("{{classes}}",e.join(" "));this.revokeBtn=u.call(this,i);var n=this.revokeBtn;if(this.options.animateRevokable){var o=t.throttle(function(e){var i=!1,o=20,s=window.innerHeight-20;t.hasClass(n,"cc-top")&&e.clientY<o&&(i=!0),t.hasClass(n,"cc-bottom")&&e.clientY>s&&(i=!0),i?t.hasClass(n,"cc-active")||t.addClass(n,"cc-active"):t.hasClass(n,"cc-active")&&t.removeClass(n,"cc-active")},200);this.onMouseMove=o,window.addEventListener("mousemove",o)}}}var g={enabled:!0,container:null,cookie:{name:"cookieconsent_status",path:"/",domain:"",expiryDays:365},onPopupOpen:function(){},onPopupClose:function(){},onInitialise:function(e){},onStatusChange:function(e,t){},onRevokeChoice:function(){},content:{header:"Cookies used on the website!",message:"This website uses cookies to ensure you get the best experience on our website.",dismiss:"Got it!",allow:"Allow cookies",deny:"Decline",link:"Learn more",href:"http://cookiesandyou.com",close:"&#x274c;"},elements:{header:'<span class="cc-header">{{header}}</span>&nbsp;',message:'<span id="cookieconsent:desc" class="cc-message">{{message}}</span>',messagelink:'<span id="cookieconsent:desc" class="cc-message">{{message}} <a aria-label="learn more about cookies" tabindex="0" class="cc-link" href="{{href}}" target="_blank">{{link}}</a></span>',dismiss:'<a aria-label="dismiss cookie message" tabindex="0" class="cc-btn cc-dismiss">{{dismiss}}</a>',allow:'<a aria-label="allow cookies" tabindex="0" class="cc-btn cc-allow">{{allow}}</a>',deny:'<a aria-label="deny cookies" tabindex="0" class="cc-btn cc-deny">{{deny}}</a>',link:'<a aria-label="learn more about cookies" tabindex="0" class="cc-link" href="{{href}}" target="_blank">{{link}}</a>',close:'<span aria-label="dismiss cookie message" tabindex="0" class="cc-close">{{close}}</span>'},window:'<div role="dialog" aria-label="cookieconsent" aria-describedby="cookieconsent:desc" class="cc-window {{classes}}">{{children}}</div>',revokeBtn:'<div class="cc-revoke {{classes}}">Cookie Policy</div>',compliance:{info:'<div class="cc-compliance">{{dismiss}}</div>',"opt-in":'<div class="cc-compliance cc-highlight">{{dismiss}}{{allow}}</div>',"opt-out":'<div class="cc-compliance cc-highlight">{{deny}}{{dismiss}}</div>'},type:"info",layouts:{basic:"{{messagelink}}{{compliance}}","basic-close":"{{messagelink}}{{compliance}}{{close}}","basic-header":"{{header}}{{message}}{{link}}{{compliance}}"},layout:"basic",position:"bottom",theme:"block",palette:null,revokable:!1,animateRevokable:!0,showLink:!0,dismissOnScroll:!1,dismissOnTimeout:!1,autoOpen:!0,autoAttach:!0,whitelistPage:[],blacklistPage:[],overrideHTML:null};return n.prototype.initialise=function(e){this.options&&this.destroy(),t.deepExtend(this.options={},g),t.isPlainObject(e)&&t.deepExtend(this.options,e),r.call(this)&&(this.options.enabled=!1),m(this.options.blacklistPage,location.pathname)&&(this.options.enabled=!1),m(this.options.whitelistPage,location.pathname)&&(this.options.enabled=!0);var i=this.options.window.replace("{{classes}}",c.call(this).join(" ")).replace("{{children}}",l.call(this)),n=this.options.overrideHTML;if("string"==typeof n&&n.length&&(i=n),this.options["static"]){var o=u.call(this,'<div class="cc-grower">'+i+"</div>");o.style.display="",this.element=o.firstChild,this.element.style.display="none",t.addClass(this.element,"cc-invisible")}else this.element=u.call(this,i);b.call(this),y.call(this),this.options.autoOpen&&this.autoOpen()},n.prototype.destroy=function(){this.onButtonClick&&this.element&&(this.element.removeEventListener("click",this.onButtonClick),this.onButtonClick=null),this.dismissTimeout&&(clearTimeout(this.dismissTimeout),this.dismissTimeout=null),this.onWindowScroll&&(window.removeEventListener("scroll",this.onWindowScroll),this.onWindowScroll=null),this.onMouseMove&&(window.removeEventListener("mousemove",this.onMouseMove),this.onMouseMove=null),this.element&&this.element.parentNode&&this.element.parentNode.removeChild(this.element),this.element=null,this.revokeBtn&&this.revokeBtn.parentNode&&this.revokeBtn.parentNode.removeChild(this.revokeBtn),this.revokeBtn=null,f(this.options.palette),this.options=null},n.prototype.open=function(t){if(this.element)return this.isOpen()||(e.hasTransition?this.fadeIn():this.element.style.display="",this.options.revokable&&this.toggleRevokeButton(),this.options.onPopupOpen.call(this)),this},n.prototype.close=function(t){if(this.element)return this.isOpen()&&(e.hasTransition?this.fadeOut():this.element.style.display="none",t&&this.options.revokable&&this.toggleRevokeButton(!0),this.options.onPopupClose.call(this)),this},n.prototype.fadeIn=function(){var i=this.element;if(e.hasTransition&&i&&(this.afterTransition&&s.call(this,i),t.hasClass(i,"cc-invisible"))){if(i.style.display="",this.options["static"]){var n=this.element.clientHeight;this.element.parentNode.style.maxHeight=n+"px"}var r=20;this.openingTimeout=setTimeout(o.bind(this,i),r)}},n.prototype.fadeOut=function(){var i=this.element;e.hasTransition&&i&&(this.openingTimeout&&(clearTimeout(this.openingTimeout),o.bind(this,i)),t.hasClass(i,"cc-invisible")||(this.options["static"]&&(this.element.parentNode.style.maxHeight=""),this.afterTransition=s.bind(this,i),i.addEventListener(e.transitionEnd,this.afterTransition),t.addClass(i,"cc-invisible")))},n.prototype.isOpen=function(){return this.element&&""==this.element.style.display&&(!e.hasTransition||!t.hasClass(this.element,"cc-invisible"))},n.prototype.toggleRevokeButton=function(e){this.revokeBtn&&(this.revokeBtn.style.display=e?"":"none")},n.prototype.revokeChoice=function(e){this.options.enabled=!0,this.clearStatus(),this.options.onRevokeChoice.call(this),e||this.autoOpen()},n.prototype.hasAnswered=function(t){return Object.keys(e.status).indexOf(this.getStatus())>=0},n.prototype.hasConsented=function(t){var i=this.getStatus();return i==e.status.allow||i==e.status.dismiss},n.prototype.autoOpen=function(e){!this.hasAnswered()&&this.options.enabled&&this.open()},n.prototype.setStatus=function(i){var n=this.options.cookie,o=t.getCookie(n.name),s=Object.keys(e.status).indexOf(o)>=0;Object.keys(e.status).indexOf(i)>=0?(t.setCookie(n.name,i,n.expiryDays,n.domain,n.path),this.options.onStatusChange.call(this,i,s)):this.clearStatus()},n.prototype.getStatus=function(){return t.getCookie(this.options.cookie.name)},n.prototype.clearStatus=function(){var e=this.options.cookie;t.setCookie(e.name,"",-1,e.domain,e.path)},n}(),e.Location=function(){function e(e){t.deepExtend(this.options={},s),t.isPlainObject(e)&&t.deepExtend(this.options,e),this.currentServiceIndex=-1}function i(e,t,i){var n,o=document.createElement("script");o.type="text/"+(e.type||"javascript"),o.src=e.src||e,o.async=!1,o.onreadystatechange=o.onload=function(){var e=o.readyState;clearTimeout(n),t.done||e&&!/loaded|complete/.test(e)||(t.done=!0,t(),o.onreadystatechange=o.onload=null)},document.body.appendChild(o),n=setTimeout(function(){t.done=!0,t(),o.onreadystatechange=o.onload=null},i)}function n(e,t,i,n,o){var s=new(window.XMLHttpRequest||window.ActiveXObject)("MSXML2.XMLHTTP.3.0");if(s.open(n?"POST":"GET",e,1),s.setRequestHeader("X-Requested-With","XMLHttpRequest"),s.setRequestHeader("Content-type","application/x-www-form-urlencoded"),Array.isArray(o))for(var r=0,a=o.length;r<a;++r){var c=o[r].split(":",2);s.setRequestHeader(c[0].replace(/^\s+|\s+$/g,""),c[1].replace(/^\s+|\s+$/g,""))}"function"==typeof t&&(s.onreadystatechange=function(){s.readyState>3&&t(s)}),s.send(n)}function o(e){return new Error("Error ["+(e.code||"UNKNOWN")+"]: "+e.error)}var s={timeout:5e3,services:["freegeoip","ipinfo","maxmind"],serviceDefinitions:{freegeoip:function(){return{url:"//freegeoip.net/json/?callback={callback}",isScript:!0,callback:function(e,t){try{var i=JSON.parse(t);return i.error?o(i):{code:i.country_code}}catch(n){return o({error:"Invalid response ("+n+")"})}}}},ipinfo:function(){return{url:"//ipinfo.io",headers:["Accept: application/json"],callback:function(e,t){try{var i=JSON.parse(t);return i.error?o(i):{code:i.country}}catch(n){return o({error:"Invalid response ("+n+")"})}}}},ipinfodb:function(e){return{url:"//api.ipinfodb.com/v3/ip-country/?key={api_key}&format=json&callback={callback}",isScript:!0,callback:function(e,t){try{var i=JSON.parse(t);return"ERROR"==i.statusCode?o({error:i.statusMessage}):{code:i.countryCode}}catch(n){return o({error:"Invalid response ("+n+")"})}}}},maxmind:function(){return{url:"//js.maxmind.com/js/apis/geoip2/v2.1/geoip2.js",isScript:!0,callback:function(e){return window.geoip2?void geoip2.country(function(t){e({code:t.country.iso_code})},function(t){e(o(t))}):void e(new Error("Unexpected response format. The downloaded script should have exported `geoip2` to the global scope"))}}}}};return e.prototype.getNextService=function(){var e;do e=this.getServiceByIdx(++this.currentServiceIndex);while(!e);return e},e.prototype.getServiceByIdx=function(e){var i=this.options.services[e];if("function"==typeof i){var n=i();return n.name&&t.deepExtend(n,this.options.serviceDefinitions[n.name](n)),n}return"string"==typeof i?this.options.serviceDefinitions[i]():t.isPlainObject(i)?this.options.serviceDefinitions[i.name](i):null},e.prototype.locate=function(e,t){var i=this.getNextService();return i?(this.callbackComplete=e,this.callbackError=t,void this.runService(i,this.runNextServiceOnError.bind(this))):void t(new Error("No services to run"))},e.prototype.setupUrl=function(e){var t=this.getCurrentServiceOpts();return e.url.replace(/\{(.*?)\}/g,function(i,n){if("callback"===n){var o="callback"+Date.now();return window[o]=function(t){e.__JSONP_DATA=JSON.stringify(t)},o}if(n in t.interpolateUrl)return t.interpolateUrl[n]})},e.prototype.runService=function(e,t){var o=this;if(e&&e.url&&e.callback){var s=e.isScript?i:n,r=this.setupUrl(e);s(r,function(i){var n=i?i.responseText:"";e.__JSONP_DATA&&(n=e.__JSONP_DATA,delete e.__JSONP_DATA),o.runServiceCallback.call(o,t,e,n)},this.options.timeout,e.data,e.headers)}},e.prototype.runServiceCallback=function(e,t,i){var n=this,o=function(t){s||n.onServiceResult.call(n,e,t)},s=t.callback(o,i);s&&this.onServiceResult.call(this,e,s)},e.prototype.onServiceResult=function(e,t){t instanceof Error||t&&t.error?e.call(this,t,null):e.call(this,null,t)},e.prototype.runNextServiceOnError=function(e,t){if(e){this.logError(e);var i=this.getNextService();i?this.runService(i,this.runNextServiceOnError.bind(this)):this.completeService.call(this,this.callbackError,new Error("All services failed"))}else this.completeService.call(this,this.callbackComplete,t)},e.prototype.getCurrentServiceOpts=function(){var e=this.options.services[this.currentServiceIndex];return"string"==typeof e?{name:e}:"function"==typeof e?e():t.isPlainObject(e)?e:{}},e.prototype.completeService=function(e,t){this.currentServiceIndex=-1,e&&e(t)},e.prototype.logError=function(e){var t=this.currentServiceIndex,i=this.getServiceByIdx(t);console.error("The service["+t+"] ("+i.url+") responded with the following error",e)},e}(),e.Law=function(){function e(e){this.initialise.apply(this,arguments)}var i={regionalLaw:!0,hasLaw:["AT","BE","BG","HR","CZ","CY","DK","EE","FI","FR","DE","EL","HU","IE","IT","LV","LT","LU","MT","NL","PL","PT","SK","SI","ES","SE","GB","UK"],revokable:["HR","CY","DK","EE","FR","DE","LV","LT","NL","PT","ES"],explicitAction:["HR","IT","ES"]};return e.prototype.initialise=function(e){t.deepExtend(this.options={},i),t.isPlainObject(e)&&t.deepExtend(this.options,e)},e.prototype.get=function(e){var t=this.options;return{hasLaw:t.hasLaw.indexOf(e)>=0,revokable:t.revokable.indexOf(e)>=0,explicitAction:t.explicitAction.indexOf(e)>=0}},e.prototype.applyLaw=function(e,t){var i=this.get(t);return i.hasLaw||(e.enabled=!1),this.options.regionalLaw&&(i.revokable&&(e.revokable=!0),i.explicitAction&&(e.dismissOnScroll=!1,e.dismissOnTimeout=!1)),e},e}(),e.initialise=function(t,i,n){var o=new e.Law(t.law);i||(i=function(){}),n||(n=function(){}),e.getCountryCode(t,function(n){delete t.law,delete t.location,n.code&&(t=o.applyLaw(t,n.code)),i(new e.Popup(t))},function(i){delete t.law,delete t.location,n(i,new e.Popup(t))})},e.getCountryCode=function(t,i,n){if(t.law&&t.law.countryCode)return void i({code:t.law.countryCode});if(t.location){var o=new e.Location(t.location);return void o.locate(function(e){i(e||{})},n)}i({})},e.utils=t,e.hasInitialised=!0,window.cookieconsent=e}}(window.cookieconsent||{});
\ No newline at end of file
diff --git a/examples/customTheme.css b/examples/customTheme.css
new file mode 100644
index 00000000..0d242f04
--- /dev/null
+++ b/examples/customTheme.css
@@ -0,0 +1,58 @@
+
+.cc-window {
+  color: black;
+}
+
+.cc-message {
+  width: auto;
+  background: white;
+  padding: 20px 76px 20px 16px;
+  border-radius: 10px;
+  margin-right: -70px;
+  margin-left: 20%;
+}
+
+.cc-link, .cc-link:visited {
+  color: red;
+}
+
+.cc-btn {
+  background: #0000ff;
+  background: -moz-radial-gradient(center, ellipse cover, #0000ff 0%, #99007c 100%);
+  background: -webkit-radial-gradient(center, ellipse cover, #0000ff 0%,#99007c 100%);
+  background: radial-gradient(ellipse at center, #0000ff 0%,#99007c 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0000ff', endColorstr='#99007c',GradientType=1 );
+  padding: 58px 0;
+  color: red;
+  border: 4px dotted red;
+  border-radius: 100px;
+  -webkit-animation:spin 4s linear infinite;
+  -moz-animation:spin 4s linear infinite;
+  animation:spin 4s linear infinite;
+}
+
+.cc-btn:hover {
+  background: #99007c;
+  -webkit-animation: none;
+  -moz-animation:none;
+  animation:none;
+}
+
+@-moz-keyframes spin {
+  100% {
+    -moz-transform: rotate(360deg);
+  }
+}
+
+@-webkit-keyframes spin {
+  100% {
+    -webkit-transform: rotate(360deg);
+  }
+}
+
+@keyframes spin {
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform:rotate(360deg);
+  }
+}
diff --git a/examples/example-1-themes.html b/examples/example-1-themes.html
index 281f005e..4667efd6 100644
--- a/examples/example-1-themes.html
+++ b/examples/example-1-themes.html
@@ -8,6 +8,7 @@
   <title>Demo 1 - Themes</title>
 
   <link href="examples/style.css" rel="stylesheet">
+  <link href="build/cookieconsent.min.css" rel="stylesheet">
 
 <body role="document">
 
@@ -58,7 +59,6 @@ <h1><span>Demo 1</span> Themes</h1>
           type: 'info',
           position: 'top',
           palette: palettes.honeybee,
-          pushdown: false
         },
         'Blurple': {
           type: 'opt-out',
@@ -72,7 +72,7 @@ <h1><span>Demo 1</span> Themes</h1>
         'Nuclear': {
           type: 'info',
           position: 'bottom-right',
-          windowstyle: "edgeless",
+          theme: "edgeless",
           palette: palettes.nuclear,
           content: {
             "dismiss": "I accept certain doom"
@@ -85,7 +85,7 @@ <h1><span>Demo 1</span> Themes</h1>
         },
         'Neon': {
           type: 'info',
-          windowstyle: "classic",
+          theme: "classic",
           position: 'bottom-left',
           palette: palettes.neon,
         },
diff --git a/examples/example-2-custom-theme.html b/examples/example-2-custom-theme.html
index 99ae9aa8..e718da28 100644
--- a/examples/example-2-custom-theme.html
+++ b/examples/example-2-custom-theme.html
@@ -8,49 +8,11 @@
   <title>Demo 2 - Custom CSS</title>
 
   <link href="examples/style.css" rel="stylesheet">
+  <link href="build/cookieconsent.min.css" rel="stylesheet">
+  <link href="examples/customTheme.css" rel="stylesheet">
 
 <body class="example2" role="document">
 
-  <style>
-  .cc-window {
-    color: black;
-  }
-  .cc-message {
-    width: auto;
-    background: white;
-    padding: 20px 76px 20px 16px;
-    border-radius: 10px;
-    margin-right: -70px;
-    margin-left: 20%;
-  }
-  .cc-link, .cc-link:visited {
-    color: red;
-  }
-  .cc-btn {
-    background: #0000ff;
-    background: -moz-radial-gradient(center, ellipse cover, #0000ff 0%, #99007c 100%);
-    background: -webkit-radial-gradient(center, ellipse cover, #0000ff 0%,#99007c 100%);
-    background: radial-gradient(ellipse at center, #0000ff 0%,#99007c 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#0000ff', endColorstr='#99007c',GradientType=1 );
-    padding: 58px 0;
-    color: red;
-    border: 4px dotted red;
-    border-radius: 100px;
-    -webkit-animation:spin 4s linear infinite;
-    -moz-animation:spin 4s linear infinite;
-    animation:spin 4s linear infinite;
-  }
-  .cc-btn:hover {
-    background: #99007c;
-     -webkit-animation: none;
-    -moz-animation:none;
-    animation:none;
-  }
-  @-moz-keyframes spin { 100% { -moz-transform: rotate(360deg); } }
-  @-webkit-keyframes spin { 100% { -webkit-transform: rotate(360deg); } }
-  @keyframes spin { 100% { -webkit-transform: rotate(360deg); transform:rotate(360deg); } }
-  </style>
-
   <div class="center-outer fit">
     <div class="center-inner">
       <div class="example-window" role="main">
diff --git a/examples/example-3-informational.html b/examples/example-3-informational.html
index 8a993655..4bd52b71 100644
--- a/examples/example-3-informational.html
+++ b/examples/example-3-informational.html
@@ -8,6 +8,7 @@
   <title>Demo 3 - Informational</title>
 
   <link href="examples/style.css" rel="stylesheet">
+  <link href="build/cookieconsent.min.css" rel="stylesheet">
 
 <body class="example3" role="document">
 
diff --git a/examples/example-4-opt-out.html b/examples/example-4-opt-out.html
index 2001c1d8..09fe8511 100644
--- a/examples/example-4-opt-out.html
+++ b/examples/example-4-opt-out.html
@@ -8,6 +8,7 @@
   <title>Demo 4 - Opt-out</title>
 
   <link href="examples/style.css" rel="stylesheet">
+  <link href="build/cookieconsent.min.css" rel="stylesheet">
 
 <body class="example4" role="document">
 
diff --git a/examples/example-5-opt-in.html b/examples/example-5-opt-in.html
index 2c0e4f2f..4d056e48 100644
--- a/examples/example-5-opt-in.html
+++ b/examples/example-5-opt-in.html
@@ -8,6 +8,7 @@
   <title>Demo 5 - Opt-in</title>
 
   <link href="examples/style.css" rel="stylesheet">
+  <link href="build/cookieconsent.min.css" rel="stylesheet">
 
 <body class="example5" role="document">
 
diff --git a/examples/example-6-location.html b/examples/example-6-location.html
index da35830d..79618e6e 100644
--- a/examples/example-6-location.html
+++ b/examples/example-6-location.html
@@ -8,6 +8,7 @@
   <title>Demo 6 - Location</title>
 
   <link href="examples/style.css" rel="stylesheet">
+  <link href="build/cookieconsent.min.css" rel="stylesheet">
 
   <style>
     #message {height: 5em}
@@ -40,8 +41,9 @@ <h1><span>Demo 6</span> Location</h1>
   </div>
 
 <script src="examples/script.js"></script>
-<script src="build/cookieconsent.min.js"></script>
+<script src="src/cookieconsent.js"></script>
 <script>
+
   var COUNTRY_CODES = {
     // Representative group of countries with key differences
     'US' : 'United States',
@@ -245,62 +247,77 @@ <h1><span>Demo 6</span> Location</h1>
     'YE' : 'Yemen',
     'ZM' : 'Zambia',
     'ZW' : 'Zimbabwe'
-    };
+  };
 
   (function (C, U) {
 
-    var elems = U.createInputs(['location']);
+    var popupInst;
+    var $loc = document.getElementById('location');
 
-    var updater = U.createUpdater(elems, draw.bind(null, '__cookieconsent_popup'));
+    U.fillSelect($loc, COUNTRY_CODES, COUNTRY_CODES['AC']);
 
-    U.fillSelect(elems.location, COUNTRY_CODES, COUNTRY_CODES['AC'])
+    $loc.onchange = function () {
+      var code = $loc.selectedIndex >= 0 ?
+        $loc[$loc.selectedIndex].value : undefined;
 
-    updater(); // trigger the first update
-    elems.location.focus(); // focus the first input
+      if (!code)
+        return;
+
+      draw(code);
+    };
 
-    function draw(name, inputs) {
-      var code = inputs.location;
-      if (!code) return;
+    draw($loc[0].value);
 
-      // applyLaw takes the "preferred" options and changes them slightly to match the country's law
-      var options = getOptions(inputs);
-      options.countryCode = code;
+    $loc.focus();
 
-      if (!window[name]) {
-        window[name] = cookieconsent.factory(options);
-      } else {
-        window[name].clearStatus();
-        window[name].initialise(options);
+    function draw(code) {
+      var options = getOptions(code);
+
+      if (popupInst) {
+        popupInst.clearStatus();
+        popupInst.destroy();
+        popupInst = null;
       }
-      window[name].open();
+
+      cookieconsent.initialise(options, function (popup) {
+        popupInst = popup;
+        popupInst.autoOpen();
+      }, function (err) {
+        console.error(err)
+      });
 
       // show country options on screen (so user knows how this country affected the settings)
       document.getElementById('message').innerHTML = getCountryDetails(code);
     }
 
-    function getOptions(input) {
+    function getOptions(code) {
       return {
         type: 'info',
-        revokable: 'false',
         regionalLaw: true,
-        palette: {"popup":{"background":"#343c66","text":"#cfcfe8"},"button":{"background":"#f71559"}}
+        palette: {
+          "popup":{"background":"#343c66","text":"#cfcfe8"},
+          "button":{"background":"#f71559"}
+        },
+        law: {
+          // takes the "preferred" options and changes them slightly to match the country's law
+          countryCode: code,
+        }
       }
     }
 
     function getCountryDetails(code) {
       // We only get these to show (on screen) how the country behaves
-      var countryOpts = cookieconsent.law.get(code);
+      var law = new cookieconsent.Law({});
+      var countryOpts = law.get(code);
 
       if (!countryOpts.hasLaw) {
-        return U.tabularObject({
-          'Has cookie law?': 'no'
-        });
+        return 'Has cookie law? no';
       }
 
       return U.tabularObject({
         'Has cookie law?': 'yes',
-        'Choice has to be revokable?': U.yn(countryOpts.revokable),
-        'Can be automatically dismissed?': U.yn(!countryOpts.explicitAction),
+        'Choice has to be revokable?': countryOpts.revokable ? 'yes' : 'no',
+        'Can be automatically dismissed?': countryOpts.explicitAction ? 'no' : 'yes',
       });
     }
 
diff --git a/examples/example-7-javascript-api.html b/examples/example-7-javascript-api.html
index 1ce0da72..09d60a42 100644
--- a/examples/example-7-javascript-api.html
+++ b/examples/example-7-javascript-api.html
@@ -8,6 +8,7 @@
   <title>Demo 7 - JavaScript API</title>
 
   <link href="examples/style.css" rel="stylesheet">
+  <link href="build/cookieconsent.min.css" rel="stylesheet">
 
 <body class="example7" role="document">
 
@@ -49,8 +50,8 @@ <h3>Console</h3>
     </div>
   </div>
 
-<script src="build/cookieconsent.min.js"></script>
 <script src="examples/script.js"></script>
+<script src="build/cookieconsent.min.js"></script>
 <script>
 
   var h = document.getElementById('console');
@@ -60,21 +61,32 @@ <h3>Console</h3>
     h.scrollTop = h.scrollHeight;
   }
 
-  var p = cookieconsent.factory({
+  var p;
+  cookieconsent.initialise({
     type: 'opt-out',
-    palette: {"popup":{"background":"#eaf7f7","text":"#5c7291"},"button":{"background":"#56cbdb","text":"#ffffff"}},
+    palette: {
+      "popup":{"background":"#eaf7f7","text":"#5c7291"},
+      "button":{"background":"#56cbdb","text":"#ffffff"},
+    },
     onPopupOpen: function() {
       log('<em>onPopupOpen()</em> called');
     },
     onPopupClose: function() {
       log('<em>onPopupClose()</em> called');
     },
+    onInitialise: function (status) {
+      log('<em>onInitialise()</em> called with status <em>'+status+'</em>');
+    },
     onStatusChange: function(status) {
       log('<em>onStatusChange()</em> called with status <em>'+status+'</em>');
     },
     onRevokeChoice: function() {
       log('<em>onRevokeChoice()</em> called');
     },
+  }, function (popup) {
+    p = popup;
+  }, function (err) {
+    console.error(err);
   });
 
   document.getElementById('btn-dismissCookie').onclick = function (e) {
@@ -99,13 +111,8 @@ <h3>Console</h3>
   };
 
   document.getElementById('btn-revokeChoice').onclick = function (e) {
-
     log("Calling <em>revokeChoice()</em>");
-
-    // @todo Add revokeChoice() method to Cookie Consent, replace all of this with that
-    p.options.onRevokeChoice();
-    p.clearStatus();
-    p.open();
+    p.revokeChoice();
 
   };
 
diff --git a/examples/script.js b/examples/script.js
index 2e680e8f..88b9bddd 100644
--- a/examples/script.js
+++ b/examples/script.js
@@ -1,47 +1,6 @@
 
 window['cookieconsent_example_util'] = {
 
-  // Creates an object of elements.
-  createInputs: function (inputs) {
-    var elems = {};
-    inputs.forEach(function (c, i, a) {
-      elems[c] = document.getElementById(c);
-    });
-    return elems;
-  },
-
-  // Returns a function that is called every `onchange` event.
-  // Calling the returned function triggers the passed function `draw`.
-  createUpdater: function (elems, draw) {
-    var getInputs = this.getInputs.bind(this);
-    var updater = function () {
-      draw(getInputs(elems));
-    };
-    for (var prop in elems) {
-      elems[prop].onchange = function () { updater() };
-    }
-    return updater;
-  },
-
-  // Maps an object of elements into an object of the elements values
-  getInputs: function (elems) {
-    return this.mapObject(elems, function (c) {
-      if (c.tagName != 'SELECT') {
-        return c.value;
-      }
-      return c.selectedIndex >= 0 ? c[c.selectedIndex].value : undefined;
-    })
-  },
-
-  // Repeatedly uses `fillSelect` for corresponding keys in `inputs` and `opts`.
-  // `optionsFormat` must be a function that accepts an array of values and returns an object of those values.
-  //                 (the object keys are used as option values, and the object values are used as the option labels)
-  createSelects: function (inputs, opts, optionsFormat) {
-    for (var prop in inputs) {
-      this.fillSelect(inputs[prop], optionsFormat(opts[prop]), opts[prop][0]);
-    }
-  },
-
   // Fill a select element with options (html can be configured using `cb`)
   fillSelect: function (select, options, selected, cb) {
     var html = '';
@@ -54,35 +13,10 @@ window['cookieconsent_example_util'] = {
     select.innerHTML = html;
   },
 
-  // Takes an array of values and uses them as keys and provides a callback to generate a new value from the key
-  formatSelectOptionsFromArray: function (cb, opts) {
-    var obj = {};
-    opts.forEach(function (c) {
-      obj[c] = cb.apply(null, arguments);
-    });
-    return obj;
-  },
-
-  pretty: function (str) {
-    return str[0].toUpperCase() + str.slice(1).replace(/\-/g, ' ');
-  },
-
-  yn: function (bool) {
-    return bool ? 'yes' : 'no';
-  },
-
   getSimpleOption: function (label, value, selected) {
     return '<option ' + (selected ? 'selected="selected"' : '') + ' value="' + value + '">' + label + '</option>';
   },
 
-  mapObject: function (obj, cb) {
-    var newObj = {};
-    Object.keys(obj).map(function(key) {
-      newObj[key] = cb(obj[key], key, obj);
-    });
-    return newObj;
-  },
-
   tabularObject: function (obj, formatVal, formatKey) {
     var html = '<ul>';
     var defaultFn = function() { return arguments[0] };
@@ -121,7 +55,7 @@ window['cookieconsent_example_util'] = {
       // from this point, 'targ' will be a direct decendant of opts.selector
       var idx = Array.prototype.indexOf.call(options.selector.children, targ);
 
-      if (idx >= 0) {
+      if (idx >= 0 && instances[idx]) {
         instances[idx].clearStatus();
 
         // We could remember the popup that's currently open, but it gets complicated when we consider
@@ -130,11 +64,10 @@ window['cookieconsent_example_util'] = {
           if (popup.isOpen()) {
             popup.close()
           }
-          popup.toggleRevokeButton();
+          popup.toggleRevokeButton(false);
         });
 
         instances[idx].open();
-
       }
     };
 
@@ -147,7 +80,17 @@ window['cookieconsent_example_util'] = {
           }
         };
       } (options.popups[examples[i]]);
-      instances[i] = options.cookieconsent.factory(options.popups[examples[i]]);
+
+      var myOpts = options.popups[examples[i]];
+
+      myOpts.autoOpen = false;
+
+      options.cookieconsent.initialise(myOpts, function(idx, popup){
+        instances[idx] = popup;
+      }.bind(null, i), function(idx, err, popup) {
+        instances[idx] = popup;
+        console.error(err);
+      }.bind(null, i));
     }
 
     return instances;
diff --git a/gulpfile.js b/gulpfile.js
index 229cc696..1af4fe31 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -20,7 +20,6 @@ var cssBuildFiles = [
   './src/styles/base.css',
   './src/styles/layout.css',
   './src/styles/media.css',
-  './src/styles/windowstyles.css',
 
   // all theme files
   './src/styles/themes/*.css',
diff --git a/src/cookieconsent.js b/src/cookieconsent.js
index cbf5c740..83cd03de 100644
--- a/src/cookieconsent.js
+++ b/src/cookieconsent.js
@@ -1,44 +1,43 @@
-
-(function (cc) {
+(function(cc) {
   // stop from running again, if accidently included more than once.
   if (cc.hasInitialised) return;
 
   var util = {
     // http://stackoverflow.com/questions/3446170/escape-string-for-use-in-javascript-regex
-    escapeRegExp: function (str) {
+    escapeRegExp: function(str) {
       return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
     },
 
-    hasClass: function (element, selector) {
+    hasClass: function(element, selector) {
       var s = ' ';
       return element.nodeType === 1 &&
-          (s + element.className + s).replace(/[\n\t]/g, s).indexOf(s + selector + s) >= 0;
+        (s + element.className + s).replace(/[\n\t]/g, s).indexOf(s + selector + s) >= 0;
     },
 
-    addClass: function (element, className) {
+    addClass: function(element, className) {
       element.className += ' ' + className;
     },
 
-    removeClass: function (element, className) {
-      var regex = new RegExp('\\b' + util.escapeRegExp(className) + '\\b');
+    removeClass: function(element, className) {
+      var regex = new RegExp('\\b' + this.escapeRegExp(className) + '\\b');
       element.className = element.className.replace(regex, '');
     },
 
-    interpolateString: function (str, callback) {
+    interpolateString: function(str, callback) {
       var marker = /{{([a-z][a-z0-9\-_]*)}}/ig;
-      return str.replace(marker, function (matches) {
+      return str.replace(marker, function(matches) {
         return callback(arguments[1]) || '';
       })
     },
 
-    getCookie: function (name) {
+    getCookie: function(name) {
       var value = '; ' + document.cookie;
       var parts = value.split('; ' + name + '=');
       return parts.length != 2 ?
         undefined : parts.pop().split(';').shift();
     },
 
-    setCookie: function (name, value, expiryDays, domain, path) {
+    setCookie: function(name, value, expiryDays, domain, path) {
       var exdate = new Date();
       exdate.setDate(exdate.getDate() + (expiryDays || 365));
 
@@ -55,27 +54,27 @@
     },
 
     // only used for extending the initial options
-    deepExtend: function(dest, src) {
-      for (var prop in src) {
-        var v = src[prop];
-        if (typeof v === 'object' && v !== null) {
-          dest[prop] = dest[prop] || {};
-          this.deepExtend(dest[prop], v);
-        } else {
-          dest[prop] = v;
+    deepExtend: function(target, source) {
+      for (var prop in source) {
+        if (source.hasOwnProperty(prop)) {
+          if (prop in target && this.isPlainObject(target[prop]) && this.isPlainObject(source[prop])) {
+            this.deepExtend(target[prop], source[prop]);
+          } else {
+            target[prop] = source[prop];
+          }
         }
       }
-      return dest;
+      return target;
     },
 
     // only used for throttling the 'mousemove' event (used for animating the revoke button when `animateRevokable` is true)
-    throttle: function (callback, limit) {
+    throttle: function(callback, limit) {
       var wait = false;
-      return function () {
+      return function() {
         if (!wait) {
           callback.apply(this, arguments);
           wait = true;
-          setTimeout(function () {
+          setTimeout(function() {
             wait = false;
           }, limit);
         }
@@ -83,81 +82,86 @@
     },
 
     // only used for hashing json objects (used for hash mapping palette objects, used when custom colours are passed through JavaScript)
-    hash: function (str) {
-      var hash = 0, i, chr, len;
+    hash: function(str) {
+      var hash = 0,
+        i, chr, len;
       if (str.length === 0) return hash;
-      for (i = 0, len = str.length; i < len; i++) {
-        chr   = str.charCodeAt(i);
-        hash  = ((hash << 5) - hash) + chr;
+      for (i = 0, len = str.length; i < len; ++i) {
+        chr = str.charCodeAt(i);
+        hash = ((hash << 5) - hash) + chr;
         hash |= 0;
       }
       return hash;
     },
 
-    validateHex: function(hex) {
-      hex = hex.substr(1);
-      if (hex.length < 6) {
-        hex = hex[0]+hex[0]+hex[1]+hex[1]+hex[2]+hex[2];
+    normaliseHex: function(hex) {
+      if (hex[0] == '#') {
+        hex = hex.substr(1);
+      }
+      if (hex.length == 3) {
+        hex = hex[0] + hex[0] + hex[1] + hex[1] + hex[2] + hex[2];
       }
       return hex;
     },
 
     // used to get text colors if not set
-    getContrast: function (hex){
-      hex = util.validateHex(hex);
-      var r = parseInt(hex.substr(0,2),16);
-      var g = parseInt(hex.substr(2,2),16);
-      var b = parseInt(hex.substr(4,2),16);
-      var yiq = ((r*299)+(g*587)+(b*114))/1000;
+    getContrast: function(hex) {
+      hex = this.normaliseHex(hex);
+      var r = parseInt(hex.substr(0, 2), 16);
+      var g = parseInt(hex.substr(2, 2), 16);
+      var b = parseInt(hex.substr(4, 2), 16);
+      var yiq = ((r * 299) + (g * 587) + (b * 114)) / 1000;
       return (yiq >= 128) ? '#000' : '#fff';
     },
 
     // used to change color on highlight
     getLuminance: function(hex) {
-      hex = util.validateHex(hex);
-      if (hex=='000000') return '#222'; //for black buttons
-      var lum = 0.2;
-      var rgb = "#", c, i;
-      for (i = 0; i < 3; i++) {
-        c = parseInt(hex.substr(i*2,2), 16);
-        c = Math.round(Math.min(Math.max(0, c + (c * lum)), 255)).toString(16);
-        rgb += ("00"+c).substr(c.length);
-      }
-      return rgb;
-    },
-
-    // getting the directory of JavaScript file
-    getDirectory: function() {
-      var sc = document.getElementsByTagName("script"), s, i;
-      for(i = 0; i < sc.length; i++) {
-        s = sc.item(i);
-        if(s.src && s.src.match(/cookieconsent.min.js$/))
-        { return s.src.slice(0,-'cookieconsent.min.js'.length); }
-      }
-      return '';
+      var num = parseInt(this.normaliseHex(hex), 16), 
+          amt = 38,
+          R = (num >> 16) + amt,
+          B = (num >> 8 & 0x00FF) + amt,
+          G = (num & 0x0000FF) + amt;
+      var newColour = (0x1000000 + (R<255?R<1?0:R:255)*0x10000 + (B<255?B<1?0:B:255)*0x100 + (G<255?G<1?0:G:255)).toString(16).slice(1);
+      return '#'+newColour;
     },
 
     isMobile: function() {
-      if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) return true;
-      return false;
-    }
+      return /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+    },
 
+    isPlainObject: function(obj) {
+      // The code "typeof obj === 'object' && obj !== null" allows Array objects
+      return typeof obj === 'object' && obj !== null && obj.constructor == Object;
+    },
   };
 
   // valid cookie values
-  cc.status = {deny: 'deny', allow: 'allow', dismiss: 'dismiss'};
-
-  // is true if the browser supports css transitions
-  cc.hasTransition = (function () {
-    var style = document.documentElement.style;
-    var trans = ['t','OT','msT','MozT','KhtmlT','WebkitT'];
-    for (var i = 0, l = trans.length; i < l; ++i) {
-      if (trans[i]+'ransition' in style) return true;
+  cc.status = {
+    deny: 'deny',
+    allow: 'allow',
+    dismiss: 'dismiss'
+  };
+
+  // detects the `transitionend` event name
+  cc.transitionEnd = (function() {
+    var el = document.createElement('div');
+    var trans = {
+      t: "transitionend",
+      OT: "oTransitionEnd",
+      msT: "MSTransitionEnd",
+      MozT: "transitionend",
+      WebkitT: "webkitTransitionEnd",
+    };
+
+    for (var prefix in trans) {
+      if (trans.hasOwnProperty(prefix) && typeof el.style[prefix + 'ransition'] != 'undefined') {
+        return trans[prefix];
+      }
     }
-    return false;
+    return '';
   }());
 
-  cc.transitionEnd = 'transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd';
+  cc.hasTransition = !!cc.transitionEnd;
 
   // array of valid regexp escaped statuses
   var __allowedStatuses = Object.keys(cc.status).map(util.escapeRegExp);
@@ -165,10 +169,16 @@
   // contains references to the custom <style> tags
   cc.customStyles = {};
 
-  cc.Popup = (function () {
+  cc.Popup = (function() {
 
     var defaultOptions = {
 
+      // if false, this prevents the popup from showing (useful for giving to control to another piece of code)
+      enabled: true,
+
+      // optional (expecting a HTML element) if passed, the popup is appended to this element. default is `document.body`
+      container: null,
+
       // defaults cookie options - it is RECOMMENDED to set these values to correspond with your server
       cookie: {
         // This is the name of this cookie - you can ignore this
@@ -185,27 +195,11 @@
         expiryDays: 365,
       },
 
-      // if false, this prevents the popup from showing (useful for giving to control to another piece of code)
-      enabled: true,
-
-      // optional (expecting a HTML element) if passed, the popup is appended to this element. default is `document.body`
-      container: null,
-
-      // By default the created HTML is automatically appended to the container (which defaults to <body>). You can prevent this behaviour
-      // by setting this to false, but if you do, you must attach the `element` yourself, which is a public property of the popup instance:
-      // 
-      //     var instance = cookieconsent.factory(options);
-      //     document.body.appendChild(instance.element);
-      //
-      autoattach: true,
-
-      // Change if stylesheet is not in the same folder as javasscript
-      stylesheet: util.getDirectory()+'cookieconsent.min.css',
-
       // these callback hooks are called at certain points in the program execution
       onPopupOpen: function() {},
       onPopupClose: function() {},
-      onStatusChange: function(status) {},
+      onInitialise: function(status) {},
+      onStatusChange: function(status, chosenBefore) {},
       onRevokeChoice: function() {},
 
       // each item defines the inner text for the element that it references
@@ -220,10 +214,6 @@
         close: '&#x274c;',
       },
 
-      // used to disable link on existing layouts
-      // replaces element messagelink with message and removes content of link
-      showlink: true,
-
       // This is the HTML for the elements above. The string {{header}} will be replaced with the equivalent text below.
       // You can remove "{{header}}" and write the content directly inside the HTML if you want.
       //
@@ -242,14 +232,14 @@
         //compliance: compliance is also an element, but it is generated by the application, depending on `type` below
       },
 
-      // this refers to the popup windows position. we currently support:
-      //  banner positions: top, bottom
-      //  floating positions: top-left, top-right, bottom-left, bottom-right
-      //  adds a class `cc-floating` or `cc-banner` which helps when styling
-      position: 'bottom',
+      // The placeholders {{classes}} and {{children}} both get replaced during initialisation:
+      //  - {{classes}} is where additional classes get added
+      //  - {{children}} is where the HTML children are placed
+      window: '<div role="dialog" aria-label="cookieconsent" aria-describedby="cookieconsent:desc" class="cc-window {{classes}}">{{children}}</div>',
 
-      // select your type of popup here
-      type: 'info', // refers to `compliance` (in other words, the buttons that are displayed)
+      // This is the html for the revoke button. This only shows up after the user has selected their level of consent
+      // It can be enabled of disabled using the `revokable` option
+      revokeBtn: '<div class="cc-revoke {{classes}}">Cookie Policy</div>',
 
       // define types of 'compliance' here. '{{value}}' strings in here are linked to `elements`
       compliance: {
@@ -258,8 +248,8 @@
         'opt-out': '<div class="cc-compliance cc-highlight">{{deny}}{{dismiss}}</div>',
       },
 
-      //default layout
-      layout: 'basic',
+      // select your type of popup here
+      type: 'info', // refers to `compliance` (in other words, the buttons that are displayed)
 
       // define layout layouts here
       layouts: {
@@ -272,28 +262,38 @@
         //'my-cool-layout': '<div class="my-special-layout">{{message}}{{compliance}}</div>{{close}}',
       },
 
-      // enable pushdown for body when banner top is use
-      pushdown: true,
+      // default layout (see above)
+      layout: 'basic',
 
-      // Enables fade-in/out and pushdown animations
-      transitions: true,
+      // this refers to the popup windows position. we currently support:
+      //  - banner positions: top, bottom
+      //  - floating positions: top-left, top-right, bottom-left, bottom-right
+      //
+      // adds a class `cc-floating` or `cc-banner` which helps when styling
+      position: 'bottom', // default position is 'bottom'
 
       // Available styles
       //    -block (default, no extra classes)
       //    -edgeless
       //    -classic
-      // use your own style name and use .cc-style-STYLENAME class in CSS to edit .
+      // use your own style name and use `.cc-theme-STYLENAME` class in CSS to edit .
       // Note: style "wire" is used for the configurator, but has no CSS styles of it's own, only palette is used.
-      windowstyle: 'block',
+      theme: 'block',
 
-      // The placeholders {{classes}} and {{children}} both get replaced during initialisation:
-      //  - {{classes}} is where additional classes get added
-      //  - {{children}} is where the HTML children are placed
-      window: '<div role="dialog" aria-label="cookieconsent" aria-describedby="cookieconsent:desc" class="cc-window {{classes}}">{{children}}</div>',
+      // The popup is `fixed` by default, but if you want it to be static (inline with the page content), set this to false
+      // Note: by default, we animate the height of the popup from 0 to full size
+      static: false,
 
-      // This is the html for the revoke button. This only shows up after the user has selected their level of consent
-      // It can be enabled of disabled using the `revokable` option
-      revokeBtn: '<div class="cc-revoke {{classes}}">Cookie Policy</div>',
+      // if you want custom colours, pass them in here. this object should look like this.
+      // ideally, any custom colours/themes should be created in a separate style sheet, as this is more efficient.
+      //   {
+      //     popup: {background: '#000000', text: '#fff', link: '#fff'},
+      //     button: {background: 'transparent', border: '#f8e71c', text: '#f8e71c'},
+      //     highlight: {background: '#f8e71c', border: '#f8e71c', text: '#000000'},
+      //   }
+      // `highlight` is optional and extends `button`. if it exists, it will apply to the first button
+      // only background needs to be defined for every element. if not set, other colors can be calculated from it
+      palette: null,
 
       // Some countries REQUIRE that a user can change their mind. You can configure this yourself.
       // Most of the time this should be false, but the `cookieconsent.law` can change this to `true` if it detects that it should
@@ -302,13 +302,9 @@
       // if true, the revokable button will tranlate in and out
       animateRevokable: true,
 
-      // Make this false if you want to disable all regional overrides for settings.
-      // If true, options can differ by country, depending on their cookie law.
-      // does not affect hiding the concent window for countries that do no have cooki law.
-      regionalLaw: true,
-
-      // Add two digit country code to override location services
-      countryCode: null,
+      // used to disable link on existing layouts
+      // replaces element messagelink with message and removes content of link
+      showLink: true,
 
       // set value as scroll range to enable
       dismissOnScroll: false,
@@ -316,16 +312,17 @@
       // set value as time in milliseconds to autodismiss after set time
       dismissOnTimeout: false,
 
+      // The application automatically decideds whether the popup should open.
+      // Set this to false to prevent this from happening and to allow you to control the behaviour yourself
+      autoOpen: true,
 
-      // if you want custom colours, pass them in here. this object should look like this
-      //   {
-      //     popup: {background: '#000000', text: '#fff', link: '#fff'},
-      //     button: {background: 'transparent', border: '#f8e71c', text: '#f8e71c'},
-      //     highlight: {background: '#f8e71c', border: '#f8e71c', text: '#000000'},
-      //   }
-      // `highlight` is optional and extends `button`. if it exists, it will apply to the first button
-      // only background needs to be defined for every element. if not set, other colors can be calculated from it
-      palette: null,
+      // By default the created HTML is automatically appended to the container (which defaults to <body>). You can prevent this behaviour
+      // by setting this to false, but if you do, you must attach the `element` yourself, which is a public property of the popup instance:
+      // 
+      //     var instance = cookieconsent.factory(options);
+      //     document.body.appendChild(instance.element);
+      //
+      autoAttach: true,
 
       // simple whitelist/blacklist for pages. specify page by:
       //   - using a string : '/index.html'           (matches '/index.html' exactly) OR
@@ -339,24 +336,20 @@
       overrideHTML: null,
     };
 
-    function CookiePopup () {
+    function CookiePopup() {
       this.initialise.apply(this, arguments);
     }
 
-    CookiePopup.prototype.initialise = function (options) {
+    CookiePopup.prototype.initialise = function(options) {
       if (this.options) {
         this.destroy(); // already rendered
       }
 
-      this.waitingForStylesheet = false; // set to true if we have made a request for a stylesheet, and it has not returned
-      this.openAfterStylesheet = false; // set to true if we tried to `open` to popup whilst `waitingForStylesheet`
-      this.requestedTheme = null; // this is the <link> tag containing the coookie popup style, we save it so we can delete it later
-
       // set options back to default options
       util.deepExtend(this.options = {}, defaultOptions);
 
       // merge in user options
-      if (typeof options === 'object' && options !== null) {
+      if (util.isPlainObject(options)) {
         util.deepExtend(this.options, options);
       }
 
@@ -374,19 +367,6 @@
         this.options.enabled = true;
       }
 
-
-       // load stylesheet
-      if (this.options.stylesheet) {
-        this.waitingForStylesheet = true;
-        this.requestedTheme = loadStyles.call(this, this.options.stylesheet, function (success) {
-          this.waitingForStylesheet = false;
-          if (this.openAfterStylesheet) {
-            this.openAfterStylesheet = false;
-            this.open();
-          }
-        });
-      }
-
       // the full markup either contains the wrapper or it does not (for multiple instances)
       var cookiePopup = this.options.window
         .replace('{{classes}}', getPopupClasses.call(this).join(' '))
@@ -398,19 +378,30 @@
         cookiePopup = customHTML;
       }
 
-      this.element = appendMarkup.call(this, cookiePopup);
+      // if static, we need to grow the element from 0 height so it doesn't jump the page
+      // content. we wrap an element around it which will mask the hidden content
+      if (this.options.static) {
+        // `grower` is a wrapper div with a hidden overflow whose height is animated
+        var wrapper = appendMarkup.call(this, '<div class="cc-grower">' + cookiePopup + '</div>');
 
-      cc.getCountryOptions(this.options);
+        wrapper.style.display = ''; // set it to visible (because appendMarkup hides it)
+        this.element = wrapper.firstChild; // get the `element` reference from the wrapper
+        this.element.style.display = 'none';
+        util.addClass(this.element, 'cc-invisible');
+      } else {
+        this.element = appendMarkup.call(this, cookiePopup);
+      }
 
-      // uses `dismissOnScroll` and `dismissOnTimeout`
       applyAutoDismiss.call(this);
 
       applyRevokeButton.call(this);
 
-      return this;
+      if (this.options.autoOpen) {
+        this.autoOpen();
+      }
     };
 
-    CookiePopup.prototype.destroy = function () {
+    CookiePopup.prototype.destroy = function() {
       if (this.onButtonClick && this.element) {
         this.element.removeEventListener('click', this.onButtonClick);
         this.onButtonClick = null;
@@ -441,31 +432,15 @@
       }
       this.revokeBtn = null;
 
-      if (this.requestedTheme) {
-        var styleNode = this.requestedTheme.ownerNode;
-        if (styleNode && styleNode.parentNode) {
-          styleNode.parentNode.removeChild(styleNode);
-        }
-      }
-      this.requestedTheme = null;
-
       removeCustomStyle(this.options.palette);
       this.options = null;
     };
 
-    CookiePopup.prototype.open = function (callback) {
-      if (!this.options.enabled)
-        return this;
-
-      // If we try and open the popup, and it's style hasn't loaded, set a flag to open it later
-      if (this.waitingForStylesheet) {
-        // Setting this to true means that this function will be automatically called when the stylesheet returns
-        this.openAfterStylesheet = true;
-        return;
-      }
+    CookiePopup.prototype.open = function(callback) {
+      if (!this.element) return;
 
       if (!this.isOpen()) {
-        if (hasTransition.call(this)) {
+        if (cc.hasTransition) {
           this.fadeIn();
         } else {
           this.element.style.display = '';
@@ -474,21 +449,17 @@
         if (this.options.revokable) {
           this.toggleRevokeButton();
         }
-        this.options.onPopupOpen();
+        this.options.onPopupOpen.call(this);
       }
 
-      // Add push down for body when top banner type
-      if (this.options.position == 'top') pushDown.call(this, this.element.offsetHeight);
-      
       return this;
     };
 
-    CookiePopup.prototype.close = function (showRevoke) {
-      if (!this.options.enabled)
-        return this;
+    CookiePopup.prototype.close = function(showRevoke) {
+      if (!this.element) return;
 
       if (this.isOpen()) {
-        if (hasTransition.call(this)) {
+        if (cc.hasTransition) {
           this.fadeOut();
         } else {
           this.element.style.display = 'none';
@@ -497,16 +468,16 @@
         if (showRevoke && this.options.revokable) {
           this.toggleRevokeButton(true);
         }
-        this.options.onPopupClose();
+        this.options.onPopupClose.call(this);
       }
-      if (this.options.position == 'top') pushDown.call(this, 0);
+
       return this;
     };
 
-    CookiePopup.prototype.fadeIn = function () {
+    CookiePopup.prototype.fadeIn = function() {
       var el = this.element;
 
-      if (!hasTransition.call(this))
+      if (!cc.hasTransition || !el)
         return;
 
       // This should always be called AFTER fadeOut (which is governed by the 'transitionend' event).
@@ -519,14 +490,26 @@
       if (util.hasClass(el, 'cc-invisible')) {
         el.style.display = '';
 
-        this.openingTimeout = setTimeout(afterFadeIn.bind(this, el), 5);
+        if (this.options.static) {
+          var height = this.element.clientHeight;
+          this.element.parentNode.style.maxHeight = height + 'px';
+        }
+
+        var fadeInTimeout = 20; // (ms) DO NOT MAKE THIS VALUE SMALLER. See below
+
+        // Although most browsers can handle values less than 20ms, it should remain above this value.
+        // This is because we are waiting for a "browser redraw" before we remove the 'cc-invisible' class.
+        // If the class is remvoed before a redraw could happen, then the fadeIn effect WILL NOT work, and
+        // the popup will appear from nothing. Therefore we MUST allow enough time for the browser to do
+        // it's thing. The actually difference between using 0 and 20 in a set timeout is neglegible anyway
+        this.openingTimeout = setTimeout(afterFadeIn.bind(this, el), fadeInTimeout);
       }
     };
 
-    CookiePopup.prototype.fadeOut = function () {
+    CookiePopup.prototype.fadeOut = function() {
       var el = this.element;
 
-      if (!hasTransition.call(this))
+      if (!cc.hasTransition || !el)
         return;
 
       if (this.openingTimeout) {
@@ -535,22 +518,53 @@
       }
 
       if (!util.hasClass(el, 'cc-invisible')) {
+        if (this.options.static) {
+          this.element.parentNode.style.maxHeight = '';
+        }
+
         this.afterTransition = afterFadeOut.bind(this, el);
-        el.addEventListener('transitionend', this.afterTransition);
+        el.addEventListener(cc.transitionEnd, this.afterTransition);
 
         util.addClass(el, 'cc-invisible');
       }
     };
 
-    CookiePopup.prototype.isOpen = function () {
-      return this.element && this.element.style.display == '' && (hasTransition.call(this) ? !util.hasClass(this.element, 'cc-invisible') : true);
+    CookiePopup.prototype.isOpen = function() {
+      return this.element && this.element.style.display == '' && (cc.hasTransition ? !util.hasClass(this.element, 'cc-invisible') : true);
     };
 
-    CookiePopup.prototype.toggleRevokeButton = function (show) {
+    CookiePopup.prototype.toggleRevokeButton = function(show) {
       if (this.revokeBtn) this.revokeBtn.style.display = show ? '' : 'none';
-    }; 
+    };
 
-    CookiePopup.prototype.setStatus = function (status) {
+    CookiePopup.prototype.revokeChoice = function(preventOpen) {
+      this.options.enabled = true;
+      this.clearStatus();
+
+      this.options.onRevokeChoice.call(this);
+
+      if (!preventOpen) {
+        this.autoOpen();
+      }
+    };
+
+    // returns true if the cookie has a valid value
+    CookiePopup.prototype.hasAnswered = function(options) {
+      return Object.keys(cc.status).indexOf(this.getStatus()) >= 0;
+    };
+
+    // returns true if the cookie indicates that consent has been given
+    CookiePopup.prototype.hasConsented = function(options) {
+      var val = this.getStatus();
+      return val == cc.status.allow || val == cc.status.dismiss;
+    };
+
+    // opens the popup if no answer has been given
+    CookiePopup.prototype.autoOpen = function(options) {
+      !this.hasAnswered() && this.options.enabled && this.open();
+    };
+
+    CookiePopup.prototype.setStatus = function(status) {
       var c = this.options.cookie;
       var value = util.getCookie(c.name);
       var chosenBefore = Object.keys(cc.status).indexOf(value) >= 0;
@@ -559,40 +573,40 @@
       if (Object.keys(cc.status).indexOf(status) >= 0) {
         util.setCookie(c.name, status, c.expiryDays, c.domain, c.path);
 
-        this.options.onStatusChange(status, chosenBefore);
+        this.options.onStatusChange.call(this, status, chosenBefore);
       } else {
         this.clearStatus();
       }
     };
 
-    CookiePopup.prototype.getStatus = function () {
+    CookiePopup.prototype.getStatus = function() {
       return util.getCookie(this.options.cookie.name);
     };
 
-    CookiePopup.prototype.clearStatus = function () {
+    CookiePopup.prototype.clearStatus = function() {
       var c = this.options.cookie;
       util.setCookie(c.name, '', -1, c.domain, c.path);
     };
 
     // This needs to be called after 'fadeIn'. This is the code that actually causes the fadeIn to work
     // There is a good reason why it's called in a timeout. Read 'fadeIn';
-    function afterFadeIn (el) {
-      this.openingTimeout =  null;
+    function afterFadeIn(el) {
+      this.openingTimeout = null;
       util.removeClass(el, 'cc-invisible');
     }
 
     // This is called on 'transitionend' (only on the transition of the fadeOut). That's because after we've faded out, we need to
     // set the display to 'none' (so there aren't annoying invisible popups all over the page). If for whenever reason this function
     // is not called (lack of support), the open/close mechanism will still work.
-    function afterFadeOut (el) {
+    function afterFadeOut(el) {
       el.style.display = 'none'; // after close and before open, the display should be none
-      el.removeEventListener('transitionend', this.afterTransition);
+      el.removeEventListener(cc.transitionEnd, this.afterTransition);
       this.afterTransition = null;
     }
 
     // this function calls the `onComplete` hook and returns true (if needed) and returns false otherwise
-    function checkCallbackHooks () {
-      var complete = this.options.onStatusChange;
+    function checkCallbackHooks() {
+      var complete = this.options.onInitialise.bind(this);
 
       if (!window.navigator.cookieEnabled) {
         complete(cc.status.deny);
@@ -614,27 +628,36 @@
       return match;
     }
 
-    function getPositionClasses () {
+    function getPositionClasses() {
       var positions = this.options.position.split('-'); // top, bottom, left, right
       var classes = [];
 
       // top, left, right, bottom
-      positions.forEach(function (cur) {
+      positions.forEach(function(cur) {
         classes.push('cc-' + cur);
       });
 
       return classes;
     }
 
-    function getPopupClasses () {
+    function getPopupClasses() {
       var opts = this.options;
       var positionStyle = (opts.position == 'top' || opts.position == 'bottom') ? 'banner' : 'floating';
+
+      if (util.isMobile()) {
+        positionStyle = 'floating';
+      }
+
       var classes = [
-        'cc-' + positionStyle,      // floating or banner
-        'cc-type-' + opts.type,   // add the compliance type
-        'cc-windowstyle-' + opts.windowstyle, // add the windwowstyle class
+        'cc-' + positionStyle, // floating or banner
+        'cc-type-' + opts.type, // add the compliance type
+        'cc-theme-' + opts.theme, // add the theme
       ];
 
+      if (opts.static) {
+        classes.push('cc-static');
+      }
+
       classes.push.apply(classes, getPositionClasses.call(this));
 
       // we only add extra styles if `palette` has been set to a valid value
@@ -648,36 +671,36 @@
       return classes;
     }
 
-    function getPopupInnerMarkup () {
+    function getPopupInnerMarkup() {
       var interpolated = {};
       var opts = this.options;
 
-      //removes link if showlink is false
-      if(opts.showlink == 'false') { 
+      // removes link if showLink is false
+      if (!opts.showLink) {
         opts.elements.link = '';
         opts.elements.messagelink = opts.elements.message;
       }
 
-      Object.keys(opts.elements).forEach(function (prop) {
-        interpolated[prop] = util.interpolateString(opts.elements[prop], function (name) {
+      Object.keys(opts.elements).forEach(function(prop) {
+        interpolated[prop] = util.interpolateString(opts.elements[prop], function(name) {
           var str = opts.content[name];
           return (name && typeof str == 'string' && str.length) ? str : '';
         })
       });
 
+      // checks if the type is valid and defaults to info if it's not
       var complianceType = opts.compliance[opts.type];
-
       if (!complianceType) {
         complianceType = opts.compliance.info;
       }
 
       // build the compliance types from the already interpolated `elements`
-      interpolated.compliance = util.interpolateString(complianceType, function (name) {
+      interpolated.compliance = util.interpolateString(complianceType, function(name) {
         return interpolated[name];
       });
 
+      // checks if the layout is valid and defaults to basic if it's not
       var layout = opts.layouts[opts.layout];
-
       if (!layout) {
         layout = opts.layouts.basic;
       }
@@ -687,7 +710,7 @@
       });
     }
 
-    function appendMarkup (markup) {
+    function appendMarkup(markup) {
       var opts = this.options;
       var div = document.createElement('div');
       var cont = (opts.container && opts.container.nodeType === 1) ? opts.container : document.body;
@@ -698,7 +721,7 @@
 
       el.style.display = 'none';
 
-      if (util.hasClass(el, 'cc-window') && hasTransition.call(this)) {
+      if (util.hasClass(el, 'cc-window') && cc.hasTransition) {
         util.addClass(el, 'cc-invisible');
       }
 
@@ -707,7 +730,7 @@
 
       el.addEventListener('click', this.onButtonClick);
 
-      if (opts.autoattach) {
+      if (opts.autoAttach) {
         if (!cont.firstChild) {
           cont.appendChild(el);
         } else {
@@ -718,7 +741,7 @@
       return el;
     }
 
-    function handleButtonClick (event) {
+    function handleButtonClick(event) {
       var targ = event.target;
       if (util.hasClass(targ, 'cc-btn')) {
 
@@ -735,28 +758,26 @@
         this.close(true);
       }
       if (util.hasClass(targ, 'cc-revoke')) {
-        this.options.onRevokeChoice();
-        this.clearStatus();
-        this.open();
+        this.revokeChoice();
       }
     }
 
     // I might change this function to use inline styles. I originally chose a stylesheet because I could select many elements with a
     // single rule (something that happened a lot), the apps has changed slightly now though, so inline styles might be more applicable.
-    function attachCustomPalette (palette) {
+    function attachCustomPalette(palette) {
       var hash = util.hash(JSON.stringify(palette));
       var selector = 'cc-color-override-' + hash;
-      var isValid = typeof palette == 'object' && palette !== null;
+      var isValid = util.isPlainObject(palette);
 
       this.customStyleSelector = isValid ? selector : null;
 
       if (isValid) {
-        addCustomStyle(hash, palette, '.'+selector);
+        addCustomStyle(hash, palette, '.' + selector);
       }
       return isValid;
     }
 
-    function addCustomStyle (hash, palette, prefix) {
+    function addCustomStyle(hash, palette, prefix) {
 
       // only add this if a style like it doesn't exist
       if (cc.customStyles[hash]) {
@@ -771,48 +792,50 @@
       var highlight = palette.highlight;
 
       // needs background colour, text and link will be set to black/white if not specified
-      if (popup) { 
+      if (popup) {
         // assumes popup.background is set
         popup.text = popup.text ? popup.text : util.getContrast(popup.background);
         popup.link = popup.link ? popup.link : popup.text;
         colorStyles[prefix + '.cc-window'] = [
-          'color: '+popup.text, 
-          'background-color: '+popup.background
+          'color: ' + popup.text,
+          'background-color: ' + popup.background
         ];
         colorStyles[prefix + '.cc-revoke'] = [
-          'color: '+popup.text, 
-          'background-color: '+popup.background
+          'color: ' + popup.text,
+          'background-color: ' + popup.background
+        ];
+        colorStyles[prefix + ' .cc-link,' + prefix + ' .cc-link:active,' + prefix + ' .cc-link:visited'] = [
+          'color: ' + popup.link
         ];
-        colorStyles[prefix + ' .cc-link,' + prefix + ' .cc-link:active,' + prefix + ' .cc-link:visited'   ] = [
-          'color: '+popup.link
-          ];
 
         if (button) {
           // assumes button.background is set
           button.text = button.text ? button.text : util.getContrast(button.background);
           button.border = button.border ? button.border : 'transparent';
           colorStyles[prefix + ' .cc-btn'] = [
-            'color: '+button.text, 
-            'border-color: '+button.border, 
-            'background-color: '+button.background
-          ];
-          colorStyles[prefix + ' .cc-btn:hover'] = [
-            'background-color: ' + util.getLuminance(button.background)
+            'color: ' + button.text,
+            'border-color: ' + button.border,
+            'background-color: ' + button.background
           ];
+          
+          if(button.background != 'transparent') 
+            colorStyles[prefix + ' .cc-btn:hover'] = [
+              'background-color: ' + getHoverColour(button.background)
+            ];
 
           if (highlight) {
             //assumes highlight.background is set
             highlight.text = highlight.text ? highlight.text : util.getContrast(highlight.background);
             highlight.border = highlight.border ? highlight.border : 'transparent';
             colorStyles[prefix + ' .cc-highlight .cc-btn:first-child'] = [
-              'color: '+highlight.text, 
-              'border-color: '+highlight.border, 
-              'background-color: '+highlight.background
+              'color: ' + highlight.text,
+              'border-color: ' + highlight.border,
+              'background-color: ' + highlight.background
             ];
-          } else { 
+          } else {
             // sets highlight text color to popup text. background and border are transparent by default.
             colorStyles[prefix + ' .cc-highlight .cc-btn:first-child'] = [
-              'color: '+popup.text
+              'color: ' + popup.text
             ];
           }
         }
@@ -824,16 +847,30 @@
       document.head.appendChild(style);
 
       // custom style doesn't exist, so we create it
-      cc.customStyles[hash] = {references: 1, element: style.sheet};
+      cc.customStyles[hash] = {
+        references: 1,
+        element: style.sheet
+      };
 
       var ruleIndex = -1;
       for (var prop in colorStyles) {
-        style.sheet.insertRule(prop + '{' + colorStyles[prop].join(';') + '}', ++ruleIndex);
+        if (colorStyles.hasOwnProperty(prop)) {
+          style.sheet.insertRule(prop + '{' + colorStyles[prop].join(';') + '}', ++ruleIndex);
+        }
+      }
+    }
+
+    function getHoverColour(hex) {
+      hex = util.normaliseHex(hex);
+      // for black buttons
+      if (hex == '000000') {
+        return '#222';
       }
+      return util.getLuminance(hex);
     }
 
-    function removeCustomStyle (palette) {
-      if (typeof palette == 'object' && palette !== null) {
+    function removeCustomStyle(palette) {
+      if (util.isPlainObject(palette)) {
         var hash = util.hash(JSON.stringify(palette));
         var customStyle = cc.customStyles[hash];
         if (customStyle && !--customStyle.references) {
@@ -846,7 +883,7 @@
       }
     }
 
-    function arrayContainsMatches (array, search) {
+    function arrayContainsMatches(array, search) {
       for (var i = 0, l = array.length; i < l; ++i) {
         var str = array[i];
         // if regex matches or string is equal, return true
@@ -858,19 +895,19 @@
       return false;
     }
 
-    function applyAutoDismiss () {
+    function applyAutoDismiss() {
       var setStatus = this.setStatus.bind(this);
 
       var delay = this.options.dismissOnTimeout;
       if (typeof delay == 'number' && delay >= 0) {
-        this.dismissTimeout = window.setTimeout(function () {
+        this.dismissTimeout = window.setTimeout(function() {
           setStatus(cc.status.dismiss);
         }, Math.floor(delay));
       }
 
       var scrollRange = this.options.dismissOnScroll;
       if (typeof scrollRange == 'number' && scrollRange >= 0) {
-        var onWindowScroll = function (evt) {
+        var onWindowScroll = function(evt) {
           if (window.pageYOffset > Math.floor(scrollRange)) {
             setStatus(cc.status.dismiss);
 
@@ -884,11 +921,11 @@
       }
     }
 
-    function applyRevokeButton () {
+    function applyRevokeButton() {
       // revokable is true if advanced compliance is selected
-      if(this.options.type != 'info') this.options.revokable = true;
+      if (this.options.type != 'info') this.options.revokable = true;
       // animateRevokable false for mobile devices
-      if(util.isMobile()) this.options.animateRevokable = false;
+      if (util.isMobile()) this.options.animateRevokable = false;
 
       if (this.options.revokable) {
         var classes = getPositionClasses.call(this);
@@ -904,7 +941,7 @@
         var btn = this.revokeBtn;
         if (this.options.animateRevokable) {
           var wait = false;
-          var onMouseMove = util.throttle(function (evt) {
+          var onMouseMove = util.throttle(function(evt) {
             var active = false;
             var minY = 20;
             var maxY = (window.innerHeight - 20);
@@ -929,201 +966,223 @@
       }
     }
 
-    function loadStyles(stylesheet, complete){
-      var self = this;
-      var link = document.createElement("link");
-      var createCallback = function (success) {
-        return function () {
-          complete.apply(self, [success].concat(arguments));
-        };
-      };
-      link.rel = "stylesheet";
-      link.type = "text/css";
-      link.href = stylesheet;
-      link.onload = createCallback(true);
-      link.onerror = createCallback(false);
+    return CookiePopup
+  }());
 
-      document.head.appendChild(link);
+  cc.Location = (function() {
 
-      return link;
-    }
+    // An object containing all the location services we have already set up.
+    // When using a service, it could either return a data structure in plain text (like a JSON object) or an executable script
+    // When the response needs to be executed by the browser, then `isScript` must be set to true, otherwise it won't work.
 
-    function pushDown(height) {
-      if(!this.options.pushdown) return;
-      var body = document.getElementsByTagName("body")[0]; 
-      var navbar = document.getElementsByClassName("navbar-fixed-top")[0]; //for bootstrap fixed navbar
-      if(height!=0) {
-        if(document.getElementById("wpadminbar")) height = height - 32;  // WP admin bar
-        if(hasTransition.call(this)) {
-          body.style.transition = 'all .4s linear .5s';
-          if(navbar) navbar.style.transition = 'all .4s linear .5s';
-        }
-      } else {
-        body.style.transition = 'none';
-        if(navbar) navbar.style.transition = 'none';
-      }
-      body.style.marginTop = height+'px';
-      if(navbar) navbar.style.marginTop = height+'px';
-    }
+    // When the service uses a script, the chances are that you'll have to use the script to make additional requests. In these
+    // cases, the services `callback` property is called with a `done` function. When performing async operations, this must be called
+    // with the data (or Error), and `cookieconsent.locate` will take care of the rest
+    var defaultOptions = {
 
-    function hasTransition() {
-      if (this.options) return this.options.transitions && cc.hasTransition;
-      return cc.hasTransition;
-    }
+      // The default timeout is 5 seconds. This is mainly needed to catch JSONP requests that error.
+      // Otherwise there is no easy way to catch JSONP errors. That means that if a JSONP fails, the
+      // app will take `timeout` milliseconds to react to a JSONP network error.
+      timeout: 5000,
 
-    return CookiePopup
-  }());
+      // the order that services will be attempted in
+      services: [
+        'freegeoip',
+        'ipinfo',
+        'maxmind'
 
-  cc.law = (function () {
+        /*
 
-    var hasLaw = ['AT', 'BE', 'BG', 'HR', 'CZ', 'CY', 'DK', 'EE', 'FI', 'FR', 'DE', 'EL', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'SK', 'SI', 'ES', 'SE', 'GB', 'UK', 'GB'];
-    var revokable = ['HR', 'CY', 'DK', 'EE', 'FR', 'DE', 'LV', 'LT', 'NL', 'PT', 'ES'];
-    var explicitAction = ['HR', 'IT', 'ES'];
+        // 'ipinfodb' requires some options, so we define it using an object
+        // this object will be passed to the function that defines the service
 
-    return {
+        {
+          name: 'ipinfodb',
+          interpolateUrl: {
+            // obviously, this is a fake key
+            api_key: 'vOgI3748dnIytIrsJcxS7qsDf6kbJkE9lN4yEDrXAqXcKUNvjjZPox3ekXqmMMld'
+          },
+        },
 
-      get: function (countryCode) {
-        return {
-          hasLaw: hasLaw.indexOf(countryCode) >= 0,
-          revokable: revokable.indexOf(countryCode) >= 0,
-          explicitAction: explicitAction.indexOf(countryCode) >= 0,
-        };
-      },
+        // as well as defining an object, you can define a function that returns an object
 
-      applyLaw: function (options, countryCode) {
-        var country = this.get(countryCode);
+        function () {
+          return {name: 'ipinfodb'};
+        },
 
-        if (!country.hasLaw) {
-          // The country has no cookie law
-          options.enabled = false;
-        }
+        */
+      ],
 
-        if(options.regionalLaw == true) {
-          if (country.revokable) {
-            // we must provide an option to revoke consent at a later time
-            options.revokable = true;
+      serviceDefinitions: {
+
+        freegeoip: function() {
+          return {
+            // This service responds with JSON, but they do not have CORS set, so we must use JSONP and provide a callback
+            // The `{callback}` is automatically rewritten by the tool
+            url: '//freegeoip.net/json/?callback={callback}',
+            isScript: true, // this is JSONP, therefore we must set it to run as a script
+            callback: function(done, response) {
+              try{
+                var json = JSON.parse(response);
+                return json.error ? toError(json) : {
+                  code: json.country_code
+                };
+              } catch (err) {
+                return toError({error: 'Invalid response ('+err+')'});
+              }
+            }
           }
+        },
 
-          if (country.explicitAction) {
-            // user must explicitly click the consent button
-            options.dismissOnScroll = false;
-            options.dismissOnTimeout = false;
+        ipinfo: function() {
+          return {
+            // This service responds with JSON, so we simply need to parse it and return the country code
+            url: '//ipinfo.io',
+            headers: ['Accept: application/json'],
+            callback: function(done, response) {
+              try{
+                var json = JSON.parse(response);
+                return json.error ? toError(json) : {
+                  code: json.country
+                };
+              } catch (err) {
+                return toError({error: 'Invalid response ('+err+')'});
+              }
+            }
           }
+        },
 
-        }
-        return options;
-      }
-    };
-  }());
+        // This service requires an option to define `key`. Options are proived using objects or functions
+        ipinfodb: function(options) {
+          return {
+            // This service responds with JSON, so we simply need to parse it and return the country code
+            url: '//api.ipinfodb.com/v3/ip-country/?key={api_key}&format=json&callback={callback}',
+            isScript: true, // this is JSONP, therefore we must set it to run as a script
+            callback: function(done, response) {
+              try{
+                var json = JSON.parse(response);
+                return json.statusCode == 'ERROR' ? toError({error: json.statusMessage}) : {
+                  code: json.countryCode
+                };
+              } catch (err) {
+                return toError({error: 'Invalid response ('+err+')'});
+              }
+            }
+          }
+        },
 
-  cc.locate = (function () {
+        maxmind: function() {
+          return {
+            // This service responds with a JavaScript file which defines additional functionality. Once loaded, we must
+            // make an additional AJAX call. Therefore we provide a `done` callback that can be called asynchronously
+            url: '//js.maxmind.com/js/apis/geoip2/v2.1/geoip2.js',
+            isScript: true, // this service responds with a JavaScript file, so it must be run as a script
+            callback: function(done) {
+              // if everything went okay then `geoip2` WILL be defined
+              if (!window.geoip2) {
+                done(new Error('Unexpected response format. The downloaded script should have exported `geoip2` to the global scope'));
+                return;
+              }
 
-    return {
+              geoip2.country(function(location) {
+                done({
+                  code: location.country.iso_code
+                });
+              }, function(err) {
+                done(toError(err));
+              });
 
-      // This is the index of the service that is currently being used
-      currentServiceIndex: 0,
+              // We can't return anything, because we need to wait for the second AJAX call to return.
+              // Then we can 'complete' the service by passing data or an error to the `done` callback.
+            }
+          }
+        },
+      },
+    };
 
-      // When using a service, it could either return a data structure in plain text (like a JSON object) or an executable script
-      // When the response needs to be executed by the browser, then `isScript` must be set to true, otherwise it won't work.
+    function Location(options) {
+      // Set up options
+      util.deepExtend(this.options = {}, defaultOptions);
 
-      // When the service uses a script, the chances are that you'll have to use the script to make additional requests. In these
-      // cases, the services `callback` property is called with a `done` function. When performing async operations, this must be called
-      // with the data (or Error), and `cookieconsent.locate` will take care of the rest
+      if (util.isPlainObject(options)) {
+        util.deepExtend(this.options, options);
+      }
 
-      locationServices: [
-        {
-          // This service responds with JSON, so we simply need to parse it and return the country code
-          url: 'http://ipinfo.io',
-          headers: ['Accept: application/json'],
-          callback: function (done, response) {
-            var json = JSON.parse(response);
-            return json.error ? toError(json) : {
-              code: json.country
-            };
-          }
-        },
-        {
-          // This service responds with JSON, but they do not have CORS set, so we must use JSONP and provide a callback
-          // The callback MUST BE `cookieconsent.locate.jsonp(SERVICE_INDEX)` (so cookieconsent.locate.jsonp(1) for this index)
-          url: 'http://freegeoip.net/json/?callback=cookieconsent.locate.jsonp(1)',
-          isScript: true, // this is JSONP, therefore we must set it to run as a script
-          callback: function (done, response) {
-            var json = JSON.parse(response);
-            return json.error ? toError(json) : {
-              code: json.country_code
-            };
-          }
-        },
-        {
-          // This service responds with a JavaScript file which defines additional functionality. Once loaded, we must
-          // make an additional AJAX call. Therefore we provide a `done` callback that can be called asynchronously
-          url: 'http://js.maxmind.com/js/apis/geoip2/v2.1/geoip2.js',
-          isScript: true, // this service responds with a JavaScript file, so it must be run as a script
-          callback: function (done) {
-            // if everything went okay then `geoip2` WILL be defined
-            if (!window.geoip2) {
-              done(new Error('Unexpected response format. The downloaded script should have exported `geoip2` to the global scope'));
-              return;
-            }
+      this.currentServiceIndex = -1; // the index (in options) of the service we're currently using
+    }
 
-            geoip2.country(function (location) {
-              done({
-                code: location.country.iso_code
-              });
-            }, function (err) {
-              done(toError(err));
-            });
+    Location.prototype.getNextService = function() {
+      var service;
 
-            // We can't return anything, because we need to wait for the second AJAX call to return.
-            // Then we can 'complete' the service by passing data or an error to the `done` callback.
-          }
-        }
-      ],
+      do {
+        service = this.getServiceByIdx(++this.currentServiceIndex);
+      } while (!service);
 
-      // Pass an `onComplete` function which is called asynchronously when a service has returned some data, or when all services have failed.
-      // You can pass additional services that you want to use as `services` (see format of `locationServices`)
-      init: function (onComplete, services) {
-        this.onComplete = onComplete;
+      return service;
+    };
 
-        // if caller provides additional services, use them
-        if (Object.prototype.toString.call(services) == '[object Array]') {
-          this.locationServices = this.locationServices.concat(services);
-        }
+    Location.prototype.getServiceByIdx = function(idx) {
+      // This can either be the name of a default locationService, or a function.
+      var serviceOption = this.options.services[idx];
 
-        runServices.call(this);
-      },
+      // If it's a string, use one of the location services.
+      if (typeof serviceOption === 'function') {
+        var dynamicOpts = serviceOption();
+        if (dynamicOpts.name) {
+          util.deepExtend(dynamicOpts, this.options.serviceDefinitions[dynamicOpts.name](dynamicOpts));
+        }
+        return dynamicOpts;
+      }
 
-      // This is called from the global scope in a script request that is executed as JSONP
-      jsonp: function (idx) {
-        var service = this.locationServices[idx];
-        return function (response) {
-          // it may seem like a waste to stringify it (when we are just going to parse it again) but the service
-          // callbacks are expecting the `responseText` from the service to be a string. At least this way is consistent
+      // If it's a string, use one of the location services.
+      if (typeof serviceOption === 'string') {
+        return this.options.serviceDefinitions[serviceOption]();
+      }
 
-          // set the JSONP data key as a value that is unlikely to ever be used.
-          // this property is detected and replaced as the `responseText` of a request in the `onload` callback of a script tag
-          service.__JSONP_DATA = JSON.stringify(response);
-        };
+      // If it's an object, assume {name: 'ipinfo', ...otherOptions}
+      // Allows user to pass in API keys etc.
+      if (util.isPlainObject(serviceOption)) {
+        return this.options.serviceDefinitions[serviceOption.name](serviceOption);
       }
 
+      return null;
     };
 
     // This runs the service located at index `currentServiceIndex`.
     // If the service fails, `runNextServiceOnError` will continue trying each service until all fail, or one completes successfully
-    function runServices () {
-      var idx = this.currentServiceIndex;
-      var service = this.locationServices[idx];
+    Location.prototype.locate = function(complete, error) {
+      var service = this.getNextService();
 
       if (!service) {
+        error(new Error('No services to run'));
         return;
       }
 
-      // runs service[idx] and triggers the callback on complete
-      runService(service, runNextServiceOnError.bind(this));
-    }
+      this.callbackComplete = complete;
+      this.callbackError = error;
+
+      this.runService(service, this.runNextServiceOnError.bind(this));
+    };
+
+    // Potentially adds a callback to a url for jsonp.
+    Location.prototype.setupUrl = function(service) {
+      var serviceOpts = this.getCurrentServiceOpts();
+      return service.url.replace(/\{(.*?)\}/g, function(_, param) {
+        if (param === 'callback') {
+          var tempName = 'callback' + Date.now();
+          window[tempName] = function(res) {
+            service.__JSONP_DATA = JSON.stringify(res);
+          }
+          return tempName;
+        }
+        if (param in serviceOpts.interpolateUrl) {
+          return serviceOpts.interpolateUrl[param];
+        }
+      });
+    };
 
     // requires a `service` object that defines at least a `url` and `callback`
-    function runService (service, complete) {
+    Location.prototype.runService = function(service, complete) {
       var self = this;
 
       // basic check to ensure it resembles a `service`
@@ -1134,110 +1193,145 @@
       // we call either `getScript` or `makeAsyncRequest` depending on the type of resource
       var requestFunction = service.isScript ? getScript : makeAsyncRequest;
 
+      var url = this.setupUrl(service);
+
       // both functions have similar signatures so we can pass the same arguments to both
-      requestFunction(service.url, function (xhr) {
+      requestFunction(url, function(xhr) {
         // if `!xhr`, then `getScript` function was used, so there is no response text
         var responseText = xhr ? xhr.responseText : '';
 
         // if the resource is a script, then this function is called after the script has been run.
-        // if the script is JSONP, then `cc.locate.jsonp` has already been called (as the JSONP callback).
+        // if the script is JSONP, then a time defined function `callback_{Date.now}` has already
+        // been called (as the JSONP callback). This callback sets the __JSONP_DATA property
         if (service.__JSONP_DATA) {
           responseText = service.__JSONP_DATA;
           delete service.__JSONP_DATA;
         }
 
         // call the service callback with the response text (so it can parse the response)
-        runServiceCallback.call(self, complete, service, responseText);
+        self.runServiceCallback.call(self, complete, service, responseText);
 
-      }, service.data, service.headers);
+      }, this.options.timeout, service.data, service.headers);
 
       // `service.data` and `service.headers` are optional (they only count if `!service.isScript` anyway)
-    }
+    };
 
     // The service request has run (and possibly has a `responseText`) [no `responseText` if `isScript`]
     // We need to run it's callback which determines if its successful or not
     // `complete` is called on success or failure
-    function runServiceCallback (complete, service, responseText) {
+    Location.prototype.runServiceCallback = function(complete, service, responseText) {
       var self = this;
-
-      // the function `service.callback` will either extract a country code from `responseText` and return it (in `result`)
-      // or (if it has to make additional requests) it will call a `done` callback with the country code when it is ready
-      var result = service.callback(function (asyncResult) {
+      // this is the function that is called if the service uses the async callback in its handler method
+      var serviceResultHandler = function (asyncResult) {
         // if `result` is a valid value, then this function shouldn't really run
         // even if it is called by `service.callback`
         if (!result) {
-          onServiceResult.call(self, complete, asyncResult)
+          self.onServiceResult.call(self, complete, asyncResult)
         }
-      }, responseText);
+      };
+
+      // the function `service.callback` will either extract a country code from `responseText` and return it (in `result`)
+      // or (if it has to make additional requests) it will call a `done` callback with the country code when it is ready
+      var result = service.callback(serviceResultHandler, responseText);
 
       if (result) {
-        onServiceResult.call(this, complete, result);
+        this.onServiceResult.call(this, complete, result);
       }
-    }
+    };
 
     // This is called with the `result` from `service.callback` regardless of how it provided that result (sync or async).
     // `result` will be whatever is returned from `service.callback`. A service callback should provide an object with data
-    function onServiceResult (complete, result) {
+    Location.prototype.onServiceResult = function(complete, result) {
       // convert result to nodejs style async callback
       if (result instanceof Error || (result && result.error)) {
         complete.call(this, result, null);
       } else {
         complete.call(this, null, result);
       }
-    }
+    };
 
     // if `err` is set, the next service handler is called
     // if `err` is null, the `onComplete` handler is called with `data`
-    function runNextServiceOnError (err, data) {
-      var idx = this.currentServiceIndex;
-      var service = this.locationServices[idx];
-
+    Location.prototype.runNextServiceOnError = function(err, data) {
       if (err) {
-        console.log('The service[' + idx + '] (' + service.url + ') responded with the following error', err);
+        this.logError(err);
 
-        // if another service exists
-        if (this.locationServices[idx + 1]) {
-          // an error occurred, try the next service
-          this.currentServiceIndex++;
-          runServices.call(this);
+        var nextService = this.getNextService();
+
+        if (nextService) {
+          this.runService(nextService, this.runNextServiceOnError.bind(this));
         } else {
-          completeService.call(this, null, new Error('All services failed'));
+          this.completeService.call(this, this.callbackError, new Error('All services failed'));
         }
       } else {
-        completeService.call(this, data, null);
+        this.completeService.call(this, this.callbackComplete, data);
       }
-    }
+    };
+
+    Location.prototype.getCurrentServiceOpts = function() {
+      var val = this.options.services[this.currentServiceIndex];
+
+      if (typeof val == 'string') {
+        return {name: val};
+      }
+
+      if (typeof val == 'function') {
+        return val();
+      }
+
+      if (util.isPlainObject(val)) {
+        return val;
+      }
+
+      return {};
+    };
 
     // calls the `onComplete` callback after resetting the `currentServiceIndex`
-    function completeService (data, error) {
-      this.currentServiceIndex = 0;
+    Location.prototype.completeService = function(fn, data) {
+      this.currentServiceIndex = -1;
 
-      this.onComplete(data, error);
-    }
+      fn && fn(data);
+    };
 
-    function getScript (url, callback) {
-      var s = document.createElement('script');
+    Location.prototype.logError = function (err) {
+      var idx = this.currentServiceIndex;
+      var service = this.getServiceByIdx(idx);
+
+      console.error('The service[' + idx + '] (' + service.url + ') responded with the following error', err);
+    };
+
+    function getScript(url, callback, timeout) {
+      var timeoutIdx, s = document.createElement('script');
 
       s.type = 'text/' + (url.type || 'javascript');
       s.src = url.src || url;
       s.async = false;
 
-      s.onreadystatechange = s.onload = function () {
+      s.onreadystatechange = s.onload = function() {
+        // this code handles two scenarios, whether called by onload or onreadystatechange
         var state = s.readyState;
 
+        clearTimeout(timeoutIdx);
+
         if (!callback.done && (!state || /loaded|complete/.test(state))) {
           callback.done = true;
           callback();
-          s = null;
+          s.onreadystatechange = s.onload = null;
         }
       };
 
       document.body.appendChild(s);
 
-      s = null;
+      // You can't catch JSONP Errors, because it's handled by the script tag
+      // one way is to use a timeout
+      timeoutIdx = setTimeout(function () {
+        callback.done = true;
+        callback();
+        s.onreadystatechange = s.onload = null;
+      }, timeout);
     }
 
-    function makeAsyncRequest (url, onComplete, postData, requestHeaders) {
+    function makeAsyncRequest(url, onComplete, timeout, postData, requestHeaders) {
       var xhr = new(window.XMLHttpRequest || window.ActiveXObject)('MSXML2.XMLHTTP.3.0');
 
       xhr.open(postData ? 'POST' : 'GET', url, 1);
@@ -1253,7 +1347,7 @@
       }
 
       if (typeof onComplete == 'function') {
-        xhr.onreadystatechange = function () {
+        xhr.onreadystatechange = function() {
           if (xhr.readyState > 3) {
             onComplete(xhr);
           }
@@ -1263,35 +1357,127 @@
       xhr.send(postData);
     }
 
-    function toError (obj) {
+    function toError(obj) {
       return new Error('Error [' + (obj.code || 'UNKNOWN') + ']: ' + obj.error);
     }
+
+    return Location;
   }());
 
-  cc.factory = function (options) {
-    return new cc.Popup(options);
-  };
+  cc.Law = (function() {
 
-  cc.getCountryOptions = function (options) {
-    if(options.countryCode) { 
-      cc.law.applyLaw(options, options.countryCode);
-    }
-    else {
-      cc.locate.init(function (result) {
-        cc.law.applyLaw(options, result.code);
-      });
+    var defaultOptions = {
+      // Make this false if you want to disable all regional overrides for settings.
+      // If true, options can differ by country, depending on their cookie law.
+      // It does not affect hiding the popup for countries that do not have cookie law.
+      regionalLaw: true,
+
+      // countries that enforce some version of a cookie law
+      hasLaw: ['AT', 'BE', 'BG', 'HR', 'CZ', 'CY', 'DK', 'EE', 'FI', 'FR', 'DE', 'EL', 'HU', 'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'SK', 'SI', 'ES', 'SE', 'GB', 'UK'],
+
+      // countries that say that all cookie consent choices must be revokable (a user must be able too change their mind)
+      revokable: ['HR', 'CY', 'DK', 'EE', 'FR', 'DE', 'LV', 'LT', 'NL', 'PT', 'ES'],
+
+      // countries that say that a person can only "consent" if the explicitly click on "I agree".
+      // in these countries, consent cannot be implied via a timeout or by scrolling down the page
+      explicitAction: ['HR', 'IT', 'ES'],
+    };
+
+    function Law(options) {
+      this.initialise.apply(this, arguments);
     }
-  };
 
-  // only open if the user hasnt answered
-  cc.autoOpen = function (options) {
-    var popup = cc.factory(options);
+    Law.prototype.initialise = function(options) {
+      // set options back to default options
+      util.deepExtend(this.options = {}, defaultOptions);
+
+      // merge in user options
+      if (util.isPlainObject(options)) {
+        util.deepExtend(this.options, options);
+      }
+    };
+
+    Law.prototype.get = function(countryCode) {
+      var opts = this.options;
+      return {
+        hasLaw: opts.hasLaw.indexOf(countryCode) >= 0,
+        revokable: opts.revokable.indexOf(countryCode) >= 0,
+        explicitAction: opts.explicitAction.indexOf(countryCode) >= 0,
+      };
+    };
+
+    Law.prototype.applyLaw = function(options, countryCode) {
+      var country = this.get(countryCode);
+
+      if (!country.hasLaw) {
+        // The country has no cookie law
+        options.enabled = false;
+      }
 
-    var status = popup.getStatus();
-    if (Object.keys(cc.status).indexOf(status) < 0 && popup.options.enabled) {
-      popup.open();
+      if (this.options.regionalLaw) {
+        if (country.revokable) {
+          // We must provide an option to revoke consent at a later time
+          options.revokable = true;
+        }
+
+        if (country.explicitAction) {
+          // The user must explicitly click the consent button
+          options.dismissOnScroll = false;
+          options.dismissOnTimeout = false;
+        }
+      }
+      return options;
+    };
+
+    return Law;
+  }());
+
+  // This function initialises the app by combining the use of the Popup, Locator and Law modules
+  // You can string together these three modules yourself however you want, by writing a new function.
+  cc.initialise = function(options, complete, error) {
+    var law = new cc.Law(options.law);
+
+    if (!complete) complete = function() {};
+    if (!error) error = function() {};
+
+    cc.getCountryCode(options, function(result) {
+      // don't need the law or location options anymore
+      delete options.law;
+      delete options.location;
+
+      if (result.code) {
+        options = law.applyLaw(options, result.code);
+      }
+
+      complete(new cc.Popup(options));
+    }, function(err) {
+      // don't need the law or location options anymore
+      delete options.law;
+      delete options.location;
+
+      error(err, new cc.Popup(options));
+    });
+  };
+
+  // This function tries to find your current location. It either grabs it from a hardcoded option in
+  // `options.law.countryCode`, or attempts to make a location service request. This function accepts
+  // options (which can configure the `law` and `location` modules) and fires a callback with which
+  // passes an object `{code: countryCode}` as the first argument (which can have undefined properties)
+  cc.getCountryCode = function(options, complete, error) {
+    if (options.law && options.law.countryCode) {
+      complete({
+        code: options.law.countryCode
+      });
+      return;
+    }
+    if (options.location) {
+      var locator = new cc.Location(options.location);
+      locator.locate(function(serviceResult) {
+        complete(serviceResult || {});
+      }, error);
+      return;
     }
-    return popup;
+    complete({});
   };
 
   // export utils (no point in hiding them, so we may as well expose them)
@@ -1302,4 +1488,4 @@
 
   window.cookieconsent = cc;
 
-} (window.cookieconsent || {}));
+}(window.cookieconsent || {}));
\ No newline at end of file
diff --git a/src/styles/animation.css b/src/styles/animation.css
index 570ce368..f1877e13 100644
--- a/src/styles/animation.css
+++ b/src/styles/animation.css
@@ -2,11 +2,11 @@
 .cc-window {
   opacity: 1;
   
-  -webkit-transition: opacity .5s ease;
-  -moz-transition: opacity .5s ease;
-  -ms-transition: opacity .5s ease;
-  -o-transition: opacity .5s ease;
-  transition: opacity .5s ease;
+  -webkit-transition: opacity 1s ease;
+  -moz-transition: opacity 1s ease;
+  -ms-transition: opacity 1s ease;
+  -o-transition: opacity 1s ease;
+  transition: opacity 1s ease;
 }
 
 .cc-window.cc-invisible {
@@ -35,4 +35,17 @@
 }
 .cc-revoke:hover {
   transform: translateY(0);
-}
\ No newline at end of file
+}
+
+.cc-grower {
+  /* Initially we don't want any height, and we want the contents to be hidden */
+  max-height: 0;
+  overflow: hidden;
+
+  /* Set our transitions up. */
+  -webkit-transition: max-height 1s;
+  -moz-transition: max-height 1s;
+  -ms-transition: max-height 1s;
+  -o-transition: max-height 1s;
+  transition: max-height 1s;
+}
diff --git a/src/styles/base.css b/src/styles/base.css
index 92131b1d..41e04d69 100644
--- a/src/styles/base.css
+++ b/src/styles/base.css
@@ -16,6 +16,10 @@
   z-index: 9999;
 }
 
+.cc-window.cc-static {
+  position: static;
+}
+
 /* 2 basic types of window - floating / banner */
 .cc-window.cc-floating {
   padding: 2em;
diff --git a/src/styles/themes/classic.css b/src/styles/themes/classic.css
new file mode 100644
index 00000000..cf3b51a4
--- /dev/null
+++ b/src/styles/themes/classic.css
@@ -0,0 +1,23 @@
+/* Classic */
+
+.cc-floating.cc-theme-classic {
+  padding: 1.2em;
+  border-radius: 5px;
+}
+
+.cc-floating.cc-type-info.cc-theme-classic .cc-compliance {
+  text-align: center;
+  display: inline;
+  flex: none;
+}
+
+.cc-theme-classic .cc-btn {
+  border-radius: 5px;
+}
+.cc-theme-classic .cc-btn:last-child {
+  min-width: 140px;
+}
+
+.cc-floating.cc-type-info.cc-theme-classic .cc-btn {
+  display: inline-block;
+}
diff --git a/src/styles/themes/edgeless.css b/src/styles/themes/edgeless.css
new file mode 100644
index 00000000..e575afa8
--- /dev/null
+++ b/src/styles/themes/edgeless.css
@@ -0,0 +1,24 @@
+/* Edgeless */
+
+.cc-theme-edgeless.cc-window {
+  padding: 0;
+}
+
+.cc-floating.cc-theme-edgeless .cc-message {
+  margin: 2em;
+  margin-bottom: 1.5em;
+}
+
+.cc-banner.cc-theme-edgeless .cc-btn {
+  margin: 0;
+  padding: .8em 1.8em;
+  height: 100%;
+}
+
+.cc-banner.cc-theme-edgeless .cc-message {
+  margin-left: 1em;
+}
+
+.cc-floating.cc-theme-edgeless .cc-btn +.cc-btn {
+  margin-left: 0;
+}
diff --git a/src/styles/themes/example-centered-floating.css b/src/styles/themes/example-centered-floating.css
deleted file mode 100644
index a2b2bdd1..00000000
--- a/src/styles/themes/example-centered-floating.css
+++ /dev/null
@@ -1,4 +0,0 @@
-
-.cc-theme-centered-block.cc-window {
-  text-align: center
-}
diff --git a/src/styles/windowstyles.css b/src/styles/windowstyles.css
deleted file mode 100644
index 3ae715b8..00000000
--- a/src/styles/windowstyles.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Edgeless */
-
-.cc-windowstyle-edgeless.cc-window {
-  padding: 0;
-}
-
-.cc-floating.cc-windowstyle-edgeless .cc-message {
-  margin: 2em;
-  margin-bottom: 1.5em;
-}
-
-.cc-banner.cc-windowstyle-edgeless .cc-btn {
-	margin: 0;
-	padding: .8em 1.8em;
-    height: 100%;
-}
-
-.cc-banner.cc-windowstyle-edgeless .cc-message {
-	margin-left: 1em;
-}
-
-.cc-floating.cc-windowstyle-edgeless .cc-btn +.cc-btn {
-  margin-left: 0;
-}
-
-/* Classic */
-
-.cc-floating.cc-windowstyle-classic {
-	padding: 1.2em;
-	border-radius: 5px;
-}
-
-.cc-floating.cc-type-info.cc-windowstyle-classic .cc-compliance {
-	text-align: center;
-	display: inline;
-	flex: none;
-}
-
-.cc-windowstyle-classic .cc-btn {
-	border-radius: 5px;
-}
-.cc-windowstyle-classic .cc-btn:last-child {
-    min-width: 140px;
-}
-
-.cc-floating.cc-type-info.cc-windowstyle-classic .cc-btn {
-    display: inline-block;
-}