diff --git a/_includes/header.html b/_includes/header.html
index ebcd753..5a74d2c 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -4,7 +4,7 @@
  <div class="mdl-layout__header-row mdl-cell--hide-phone mdl-cell--hide-tablet">
  <div class="mdl-layout-spacer"></div>
  <nav class="mdl-navigation">
-  <a class="mdl-navigation__link link" id="donatelink" href="#" onclick="$('#paypal').submit(); return false;">Donate</strong></a>
+  <a class="mdl-navigation__link link" id="donatelink" href="#" onclick="window.paypal();return false;">Donate</strong></a>
   <a class="mdl-navigation__link link" id="githublink" href="{{site.social.github}}">GitHub</a>
   <a class="mdl-navigation__link link" id="xdalink" href="{{site.social.xda}}">XDA Forum</a>
   <a class="mdl-navigation__link link" id="wikilink" href="{{site.social.github}}/wiki">Wiki</a>
@@ -27,7 +27,7 @@
 </div>
 </header>
 <div class="mdl-layout__drawer"><span class="mdl-layout-title">Links</span><nav class="mdl-navigation">
- <a class="mdl-navigation__link" href="#" onclick="$('#paypal').submit(); return false;">Support by <strong>Donation</strong></a>
+ <a class="mdl-navigation__link" href="#" onclick="window.paypal();return false;">Support by <strong>Donation</strong></a>
  <a class="mdl-navigation__link" href="{{site.social.github}}">Source on <strong>GitHub</strong></a>
  <a class="mdl-navigation__link" href="{{site.social.xda}}">Community on <strong>XDA Forum</strong></a>
  <a class="mdl-navigation__link" href="{{site.social.github}}/wiki">Manual on <strong>Wiki</strong></a>
diff --git a/_includes/scripts.js b/_includes/scripts.js
index 43246a2..0517bc7 100644
--- a/_includes/scripts.js
+++ b/_includes/scripts.js
@@ -9,19 +9,23 @@ var download=getUrlParam('download')==='true';var autoDownload=download&&autoAll
 function getCookie(key){key+='=';var cs=document.cookie.split(';');for(var i=0;i<cs.length;i++){var c=cs[i].trim();if(c.substr(0,key.length)===key){return c.substr(key.length).trim();}}return '';}
 function setCookie(key,value,days){var d=new Date();d.setTime(d.getTime()+(days*24*60*60*1000));document.cookie=key+"="+value+"; expires="+d.toUTCString();}
 function gaEvent(eventCategory,eventAction,eventLabel,cb,timeoutMillis){var acted=false;var act=function(){if(acted){return;}(cb||function(){})();acted=true;};try{ga('send','event',eventCategory,eventAction,eventLabel,{hitCallback:act});setTimeout(act,timeoutMillis||1);}catch(e){act();}}
+var isApp=getUrlParam('app')==='true';
+function gaEventOutbound(targetUrl,cb){gaEvent('Outbound','open',targetUrl,cb||function(){},1000);}
+window.paypal=function paypal(){gaEventOutbound('https://www.paypal.com/cgi-bin/webscr');document.getElementById('paypal').submit();return false;};
 function redirectToFile(eventCategory,eventLabel,filename){gaEvent(eventCategory,'download',eventLabel,function(){location.assign('https://github.com/opengapps/'+arch+'/releases/download/'+packages[arch].dateTag+'/'+filename);},1000);}
+function redirectToUrl(targetUrl){gaEventOutbound(targetUrl,function(){var d=true;if(isApp){d=!window.open(targetUrl,'_blank');}if(d){location.assign(targetUrl);}});}
 function downloadSubmit(){var v=validateForm();if(v==='ok'){redirectToFile('GApps',arch+'-'+api+'-'+variant,'open_gapps-'+arch+'-'+api+'-'+variant+'-'+packages[arch].dateTag+'.zip');}}
 function md5Submit(){var v=validateForm();if(v==='ok'){redirectToFile('MD5',arch+'-'+api+'-'+variant,'open_gapps-'+arch+'-'+api+'-'+variant+'-'+packages[arch].dateTag+'.zip.md5');}}
 function versionSubmit(){var v=validateForm();if(v==='variant'||v==='ok'){redirectToFile('Version',arch+'-'+api,'versions-'+arch+'-'+api+'-'+packages[arch].dateTag+'.txt');}}
-function olderSubmit(){var v=validateForm();if(v==='api'||v==='variant'||v==='ok'){var targetUrl='https://github.com/opengapps/'+arch+'/releases/';gaEvent('outbound','click',targetUrl,function(){location.assign(targetUrl);},1000);}}
+function olderSubmit(){var v=validateForm();if(v==='api'||v==='variant'||v==='ok'){redirectToUrl('https://github.com/opengapps/'+arch+'/releases/');}}
 function setButtonEnable(id,enable){var el=document.getElementById(id);if(typeof el.MaterialButton==='object'){el.MaterialButton[(!!enable)?'enable':'disable']();}}
 function setBoxEnable(id,enable){var el=document.getElementById(id).parentElement;if(typeof el.MaterialRadio==='object'){el.MaterialRadio[(!!enable)?'enable':'disable']();}}
 function setBoxCheck(id,check){var el=document.getElementById(id).parentElement;if(typeof el.MaterialRadio==='object'){el.MaterialRadio[!!check?'check':'uncheck']();}}
 function setAd(el,content,label){el.style.cssText='display:block !important';el.innerHTML=content;gaEvent('Ads','display',label);}
 var extraAds=[];extraAds.push({name:'SEFileExplorer',titleText:'Download Solid Explorer to copy Open GApps to your mobile device',altText:'Download Solid Explorer',imgName:'se',targetUrl:'https://play.google.com/store/apps/details?id=pl.solidexplorer2&referrer=utm_source%3Dopengapps%26utm_medium%3Dbanner'});
-function validateAds(){var ads=document.getElementsByClassName('adsbygoogle');var donateTextOnFirst=Math.random()<0.5;var donateTextElement=ads[donateTextOnFirst?0:1];var fallbackAdElement=ads[donateTextOnFirst?1:0];if(!donateTextElement||!fallbackAdElement){setTimeout(validateAds,500);return;}if(donateTextElement.innerHTML.trim().length===0){setAd(donateTextElement.parentElement,'<div id="donatebox"><div id="donatetitle" class="mdl-typography--display-1"><a href="#" onclick="$(\'#paypal\',parent.document).submit();return false;" title="The project is supported by donations and advertisements">Please Donate!</a></div><br /><div id="donatebody" class="mdl-typography--body-1">You blocked the advertisements, that is OK. But please consider a <a href="#" onclick="$(\'#paypal\',parent.document).submit();return false;">donation</a> to the project instead!</div><div id="donatespace"><br /></div><a href="#" onclick="$(\'#paypal\',parent.document).submit();return false;"><div id="donaterectangle"><i class="material-icons" style="color:#f5f5f5">card_giftcard</i></div></a><br /><div id="donatecaption" class="mdl-typography--caption-color-contrast">The advertisement revenue supports the projects\' efforts. Can\'t donate? <a href="abp:subscribe?location=http%3A%2F%2Fopengapps.org%2Fopengapps.org.abp.txt&amp;title=Open%20GApps" title="Add opengapps.org to your Adblocker\'s whitelist">Please unblock our ads!</a></div></div>','Donate');}else{gaEvent('Ads','display','AdSense'+(donateTextOnFirst?'Header':'Footer'));}if(fallbackAdElement.innerHTML.trim().length===0){if(extraAds.length>0){var fallbackAd=extraAds[Math.floor(Math.random()*extraAds.length)];setAd(fallbackAdElement.parentElement,'<div id="extrabox"><a id="extralink" href="#" onclick="gaEvent(\'outbound\',\'click\',\''+fallbackAd.targetUrl+'\',function(){location.assign(\''+fallbackAd.targetUrl+'\');},1000);return false;"><img src="{{site.img}}'+fallbackAd.imgName+'.'+(fallbackAdElement.parentElement.id||'topa')+'.png" alt="'+fallbackAd.altText+'" title="'+fallbackAd.titleText+'" /></a></div>','Campaign'+fallbackAd.name);}else{gaEvent('Ads','display','NoCampaign');}}else{gaEvent('Ads','display','AdSense'+(donateTextOnFirst?'Footer':'Header'));}}
+function validateAds(){var ads=document.getElementsByClassName('adsbygoogle');var donateTextOnFirst=Math.random()<0.5;var donateTextElement=ads[donateTextOnFirst?0:1];var fallbackAdElement=ads[donateTextOnFirst?1:0];if(!donateTextElement||!fallbackAdElement){setTimeout(validateAds,500);return;}if(donateTextElement.innerHTML.trim().length===0){setAd(donateTextElement.parentElement,'<div id="donatebox"><div id="donatetitle" class="mdl-typography--display-1"><a href="#" onclick="window.paypal();return false;" title="The project is supported by donations and advertisements">Please Donate!</a></div><br /><div id="donatebody" class="mdl-typography--body-1">You blocked the advertisements, that is OK. But please consider a <a href="#" onclick="window.paypal();return false;">donation</a> to the project instead!</div><div id="donatespace"><br /></div><a href="#" onclick="window.paypal();return false;"><div id="donaterectangle"><i class="material-icons" style="color:#f5f5f5">card_giftcard</i></div></a><br /><div id="donatecaption" class="mdl-typography--caption-color-contrast">The advertisement revenue supports the projects\' efforts. Can\'t donate? <a href="abp:subscribe?location=http%3A%2F%2Fopengapps.org%2Fopengapps.org.abp.txt&amp;title=Open%20GApps" title="Add opengapps.org to your Adblocker\'s whitelist">Please unblock our ads!</a></div></div>','Donate');}else{gaEvent('Ads','display','AdSense'+(donateTextOnFirst?'Header':'Footer'));}if(fallbackAdElement.innerHTML.trim().length===0){if(extraAds.length>0){var fallbackAd=extraAds[Math.floor(Math.random()*extraAds.length)];setAd(fallbackAdElement.parentElement,'<div id="extrabox"><a id="extralink" href="'+fallbackAd.targetUrl+'"><img src="{{site.img}}'+fallbackAd.imgName+'.'+(fallbackAdElement.parentElement.id||'topa')+'.png" alt="'+fallbackAd.altText+'" title="'+fallbackAd.titleText+'" /></a></div>','Campaign'+fallbackAd.name);}else{gaEvent('Ads','display','NoCampaign');}}else{gaEvent('Ads','display','AdSense'+(donateTextOnFirst?'Footer':'Header'));}}
 function validateForm(){var form=document.getElementById('DownloadForm');form.arch.each('checked',function(el){arch=el.value;});if(!archs.has(arch)||packages[arch]===undefined){return 'arch';}storage.setItem('arch',arch);form.api.each('checked',function(el){api=el.value;});if(!apis.has(api)||packages[arch].apis[api]===undefined){return 'api';}storage.setItem('api',api);form.variant.each('checked',function(el){variant=el.value;});if(!variants.has(variant)||packages[arch].apis[api][variant]===undefined){return 'variant';}storage.setItem('variant',variant);return 'ok';}
 function updateButtons(){var v=validateForm();var ch=window.componentHandler;ch.upgradeDom();var info=document.getElementById('github-latest');if(v==='arch'){info.innerHTML='<div id="github-progressbar" class="mdl-progress mdl-js-progress mdl-progress__indeterminate progress-demo"></div><span class="mdl-typography--caption-color-contrast">querying GitHub API...</span>';}else if(v==='api'){info.innerHTML='<span class="mdl-typography--subhead-color-contrast">Select an Android version</span>';}else if(v==='variant'){info.innerHTML='<span class="mdl-typography--subhead-color-contrast">Select a variant</span>';}else{info.innerHTML='<span class="mdl-typography--headline">'+packages[arch].day+' '+packages[arch].month+' '+packages[arch].year+'</span><br><span class="mdl-typography--subhead">Size: '+packages[arch].apis[api][variant].size;}ch.upgradeDom();var hasApi=function(a){return v!=='arch'&&packages[arch].apis.hasOwnProperty(a);};for(var iApi=0;iApi<apis.length;iApi++){setBoxEnable(apis[iApi],hasApi(apis[iApi]));}setBoxCheck(api,hasApi(api));var hasVariant=function(a){return v!=='arch'&&v!=='api'&&packages[arch].apis[api].hasOwnProperty(a);};for(var iVariant=0;iVariant<variants.length;iVariant++){setBoxEnable(variants[iVariant],hasVariant(variants[iVariant]));}setBoxCheck(variant,hasVariant(variant));setButtonEnable('bdownload',v==='ok');setButtonEnable('bversion',v==='ok'||v==='variant');setButtonEnable('bmd5',v==='ok');setButtonEnable('bolder',v==='ok'||v==='variant'||v==='api');}
 function queryRelease(){document.getElementById('DownloadForm').arch.each('checked',function(el){arch=el.value;});storage.setItem('arch',arch);delete packages[arch];updateButtons();var httpRequest=new XMLHttpRequest();httpRequest.onreadystatechange=function(){if(httpRequest.readyState===XMLHttpRequest.DONE&&httpRequest.status===200){var data=JSON.parse(httpRequest.responseText);var releaseName=data.name.split(' ');packages[releaseName.shift()]={'apis':{},'dateTag':data.tag_name,'year':releaseName.pop(),'month':releaseName.pop(),'day':releaseName.pop()};for(var i=0;i<data.assets.length;i++){var asset=data.assets[i];if(asset.name.substr(asset.name.length-4,4)!=='.zip'){continue;}var assetName=asset.name.split('-');if(packages[assetName[1]].apis[assetName[2]]===undefined){packages[assetName[1]].apis[assetName[2]]={};}packages[assetName[1]].apis[assetName[2]][assetName[3]]={'size':Math.round(asset.size/1024/1024*100)/100+' MiB'};}updateButtons();if(autoDownload){downloadSubmit();autoDownload=false;}}};httpRequest.open('GET','https://api.github.com/repos/opengapps/'+arch+'/releases/latest');try{httpRequest.send();}catch(e){}}
-document.addEventListener('DOMContentLoaded',function(){(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments);};i[r].l=1*new Date();a=s.createElement(o);m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m);})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create','UA-63785067-1','auto');ga('send','pageview','/');window.componentHandler.upgradeDom();for(var iAd=0;iAd<document.getElementsByClassName('adsbygoogle').length;iAd++){try{(window.adsbygoogle||[]).push({});}catch(e){validateAds();break;}}if(getCookie('c')!=='y'){window.componentHandler.upgradeDom();var snackbar=document.getElementsByClassName('mdl-js-snackbar')[0].MaterialSnackbar;snackbar.showSnackbar({message:'We use cookies to share information about your use of our site with our advertising and analytics partner',actionHandler:function(){setCookie('c','y',365);snackbar.cleanup_();},actionText:'Got it!',timeout:60000});}document.getElementById('bversion').addEventListener('click',versionSubmit);document.getElementById('bmd5').addEventListener('click',md5Submit);document.getElementById('bolder').addEventListener('click',olderSubmit);var inputs=document.getElementsByTagName('input');for(var iInput=0;iInput<inputs.length;iInput++){var input=inputs[iInput];switch(input.name){case 'arch':input.addEventListener('change',queryRelease);break;case 'api':case 'variant':input.addEventListener('change',updateButtons);break;}}queryRelease();var urlParams=window.location.search.substr(1).split('&');var isApp=false;for(var iUrlParam=0;iUrlParam<urlParams.length;iUrlParam++){var urlParam=urlParams[iUrlParam].toLowerCase();if(urlParam==='app=true'){isApp=true;}}if(isApp){var links=document.getElementsByTagName('a');for(var iLink=0;iLink<links.length;iLink++){links[iLink].target='_blank';}var forms=document.getElementsByTagName('form');for(var iForm=0;iForm<forms.length;iForm++){if(forms[iForm].id!=='DownloadForm'){forms[iForm].target='_blank';}}}});
+document.addEventListener('DOMContentLoaded',function(){(function(i,s,o,g,r,a,m){i.GoogleAnalyticsObject=r;i[r]=i[r]||function(){(i[r].q=i[r].q||[]).push(arguments);};i[r].l=1*new Date();a=s.createElement(o);m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m);})(window,document,'script','//www.google-analytics.com/analytics.js','ga');ga('create','UA-63785067-1','auto');ga('send','pageview','/');window.componentHandler.upgradeDom();for(var iAd=0;iAd<document.getElementsByClassName('adsbygoogle').length;iAd++){try{(window.adsbygoogle||[]).push({});}catch(e){validateAds();break;}}if(getCookie('c')!=='y'){window.componentHandler.upgradeDom();var snackbar=document.getElementsByClassName('mdl-js-snackbar')[0].MaterialSnackbar;snackbar.showSnackbar({message:'We use cookies to share information about your use of our site with our advertising and analytics partner',actionHandler:function(){setCookie('c','y',365);snackbar.cleanup_();},actionText:'Got it!',timeout:60000});}document.addEventListener('click',function(e){var target=e.target||e.srcElement;var href=target.href;if(target.tagName.toLowerCase()==='a'&&href.toLowerCase().substr(0,4)==='http'&&target.getAttribute('href')!=='#'){if(target.target==='_blank'||e.ctrlKey){gaEventOutbound(target.href);}else{e.preventDefault();redirectToUrl(target.href);}}});document.getElementById('bversion').addEventListener('click',versionSubmit);document.getElementById('bmd5').addEventListener('click',md5Submit);document.getElementById('bolder').addEventListener('click',olderSubmit);var inputs=document.getElementsByTagName('input');for(var iInput=0;iInput<inputs.length;iInput++){var input=inputs[iInput];switch(input.name){case 'arch':input.addEventListener('change',queryRelease);break;case 'api':case 'variant':input.addEventListener('change',updateButtons);break;}}queryRelease();if(isApp){var links=document.getElementsByTagName('a');for(var iLink=0;iLink<links.length;iLink++){links[iLink].target='_blank';}var forms=document.getElementsByTagName('form');for(var iForm=0;iForm<forms.length;iForm++){if(forms[iForm].id!=='DownloadForm'){forms[iForm].target='_blank';}}}});
 window.onload=function(){setTimeout(validateAds,2000);};
diff --git a/index.html b/index.html
index 4589529..b60e1fb 100755
--- a/index.html
+++ b/index.html
@@ -88,10 +88,10 @@
    </table>
   </form>
   <div class="downloadbuttons">
-   <button id="bdownload" class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" onclick="javascript:downloadSubmit();" disabled><i class="material-icons">file_download</i></button>
+   <button id="bdownload" class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored" disabled><i class="material-icons">file_download</i></button>
    <div id="github-latest"><div id="github-progressbar" class="mdl-progress mdl-js-progress mdl-progress__indeterminate progress-demo"></div><span class="mdl-typography--caption-color-contrast">querying GitHub API...</span></div>
-   <button id="bversion" class="mdl-button mdl-js-button mdl-button--accent" onclick="javascript:versionSubmit();" disabled>Version Information</button><br />
-   <button id="bmd5" class="mdl-button mdl-js-button mdl-button--accent" onclick="javascript:md5Submit();" disabled>MD5 Checksum</button><br />
+   <button id="bversion" class="mdl-button mdl-js-button mdl-button--accent" disabled>Version Information</button><br />
+   <button id="bmd5" class="mdl-button mdl-js-button mdl-button--accent" disabled>MD5 Checksum</button><br />
    <a id="bolderlink"><button id="bolder" class="mdl-button mdl-js-button mdl-button--accent" disabled>Older Releases</button></a>
   </div>
  </div>