diff --git a/lib/cooliris/cooliris.swf b/lib/cooliris/cooliris.swf
new file mode 100755
index 0000000000..53c09c88a9
Binary files /dev/null and b/lib/cooliris/cooliris.swf differ
diff --git a/lib/cooliris/embed.js b/lib/cooliris/embed.js
new file mode 100755
index 0000000000..cc0a1e81f6
--- /dev/null
+++ b/lib/cooliris/embed.js
@@ -0,0 +1 @@
+(function(){var M=window,i=document,H=null,N=true,n=false,B="undefined",G,p,j,u,q,k,a="#000000",K,d,I,t,Q,v,J="100%";M.cooliris=M.cooliris||{};var D=M.cooliris;D.embed=D.embed||{};var R=D.embed;R.modules=R.modules||{};var P=R.modules;var s="lib/cooliris/cooliris.swf";function y(){var aa,X,Y,U;var W=i.body;var V;if(window.innerHeight&&window.scrollMaxY){aa=i.scrollWidth;X=(this.isFrame?parent.innerHeight:self.innerHeight)+(this.isFrame?parent.scrollMaxY:self.scrollMaxY)}else{if(W.scrollHeight>W.offsetHeight){aa=W.scrollWidth;X=W.scrollHeight}else{V=i.getElementsByTagName("html")[0];aa=V.offsetWidth;X=V.offsetHeight;aa=(aa<W.offsetWidth)?W.offsetWidth:aa;X=(X<W.offsetHeight)?W.offsetHeight:X}}var e=i.documentElement;if(self.innerHeight){Y=(this.isFrame)?parent.innerWidth:self.innerWidth;U=(this.isFrame)?parent.innerHeight:self.innerHeight}else{if(e&&e.clientHeight){Y=e.clientWidth;U=e.clientHeight}else{if(W){V=i.getElementsByTagName("html").item(0);Y=V.clientWidth;U=V.clientHeight;Y=(Y==0)?W.clientWidth:Y;U=(U==0)?W.clientHeight:U}}}var m=Math.max(X,U);var Z=Math.max(aa,Y);return{pw:Z,ph:m,w:Y,h:U}}function x(V,m,U,e){var W={allowscriptaccess:"always",allowfullscreen:"true",bgColor:a,wmode:"opaque"};swfobject.embedSWF(s,V,m,U,"10.0.0","lib/cooliris/expressInstall.swf",e,W)}function E(e){var m=i.createElement("div");if(e){e.appendChild(m)}return m}function g(){j.style.display=u.style.display=q.style.display=k.style.display=p.display="none";setTimeout(T,100)}function T(){j.parentNode.removeChild(j);u.parentNode.removeChild(u);q.parentNode.removeChild(q);k.parentNode.removeChild(k);G.parentNode.removeChild(G);I=null;K=null;document.onkeydown=t;document.onkeyup=Q}function z(e,m){for(var U in e){m[U]=e[U]+"px"}}function h(U,m){var e=U.style;e.position="fixed";e.backgroundColor=a;e.zIndex=1000;e.opacity="0.33";e.filter="alpha(opacity=33)";z(m,e)}function O(){var e=y();h(j,{top:0,left:0,right:0,height:30});h(u,{bottom:0,left:0,right:0,height:30});h(q,{top:30,left:0,bottom:30,width:30});h(k,{top:30,bottom:30,right:0,width:30})}function r(){G=E(i.body);p=G.style;p.backgroundColor=a;p.position="fixed";p.border="1px solid #777";p.zIndex=1001;p.left=p.right=p.top=p.bottom="30px";j=E(i.body);j.onclick=g;u=E(i.body);u.onclick=g;q=E(i.body);q.onclick=g;k=E(i.body);k.onclick=g;O();var m=E(G);m.id="ci_swf_"+Math.floor(Math.random()*10000);var e=m.style;e.backgroundColor=a;e.width=J;e.height=J;return m.id}function b(e){return i.getElementById(e)}function f(U){if(!U.hasOwnProperty("id")){U.id=r();U.lightbox=true}else{var W=b(U.id);if(W.style.width==""){W.style.width="700px"}if(W.style.height==""){W.style.height="430px"}var V=E(W);V.id=U.id+"_swf";U.id=V.id}var m=U.width||J;var e=U.height||J;delete U.width;delete U.height;x(U.id,m,e,U);A()}function A(){t=document.onkeydown;Q=document.onkeyup;document.onkeydown=l;document.onkeyup=o}function o(U){var m;if(!U){U=window.event}if(U.keyCode){m=U.keyCode}else{if(U.which){m=U.which}}if(m==224){v=false}}function l(U){var m;if(!U){U=window.event}if(U.keyCode){m=U.keyCode}else{if(U.which){m=U.which}}if(m==224){v=true}if(C()==null||U.ctrlKey||U.shiftKey||U.altKey||v){return true}var V=!C().HKP(m);U.returnValue=V;return V}function c(e){return e!=H&&typeof(e)!=B}function F(e){var U=i.getElementsByTagName(e);var m=U.length;while(m--){if(c(U[m].GID)&&U[m].GID()=="CI_SLIDESHOW"){return U[m]}}return H}function C(){if(c(K)){return K}K=F("object");if(c(K)){return K}K=F("embed");if(c(K)){return K}return H}function L(e){C().PF(e)}function S(m,e){if(typeof(e)==B){e=L}d=window.XMLHttpRequest?new XMLHttpRequest():new ActiveXObject("MSXML2.XMLHTTP.3.0");try{I=e;d.open("GET",m,true);d.onreadystatechange=w;d.send("")}catch(U){d=null;e("")}}function w(){if(d.readyState==4){if((d.status==200||d.status==0)){if(d.responseText){I(d.responseText)}}}}R.loadXML=S;R.createSlideshow=f;R.exit=g;P.slideshow=true})();cooliris.embed.onJSLoaded("slideshow");
diff --git a/lib/cooliris/expressInstall.swf b/lib/cooliris/expressInstall.swf
new file mode 100755
index 0000000000..0fbf8fca96
Binary files /dev/null and b/lib/cooliris/expressInstall.swf differ
diff --git a/lib/cooliris/go.js b/lib/cooliris/go.js
new file mode 100755
index 0000000000..8386729fea
--- /dev/null
+++ b/lib/cooliris/go.js
@@ -0,0 +1 @@
+(function(){var l=window,d="undefined",h=null,p,n,a,g;l.cooliris=l.cooliris||{};p=l.cooliris;p.embed=p.embed||{};n=p.embed;n.modules=n.modules||{};a=n.modules;var j="lib/cooliris/embed.js",f="lib/cooliris/swfobject.js",k=0;function c(q){var m=document.getElementsByTagName("head")[0];var e=document.createElement("script");e.type="text/javascript";e.src=q;m.appendChild(e)}function o(e){k=0;if(!a.slideshow){c(j)}else{k++}if(typeof(swfobject)==d){c(f)}else{k++}g=e;b()}function i(e){k++;b()}function b(){if(k==2){cooliris.embed.createSlideshow(g)}}n.show=o;n.onJSLoaded=i})();
diff --git a/lib/cooliris/swfobject.js b/lib/cooliris/swfobject.js
new file mode 100755
index 0000000000..1b1ebde7f0
--- /dev/null
+++ b/lib/cooliris/swfobject.js
@@ -0,0 +1,5 @@
+/*  SWFObject v2.2 <http://code.google.com/p/swfobject/> 
+    is released under the MIT License <http://www.opensource.org/licenses/mit-license.php> 
+*/
+var swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y<X;Y++){U[Y]()}}function K(X){if(J){X()}else{U[U.length]=X}}function s(Y){if(typeof O.addEventListener!=D){O.addEventListener("load",Y,false)}else{if(typeof j.addEventListener!=D){j.addEventListener("load",Y,false)}else{if(typeof O.attachEvent!=D){i(O,"onload",Y)}else{if(typeof O.onload=="function"){var X=O.onload;O.onload=function(){X();Y()}}else{O.onload=Y}}}}}function h(){if(T){V()}else{H()}}function V(){var X=j.getElementsByTagName("body")[0];var aa=C(r);aa.setAttribute("type",q);var Z=X.appendChild(aa);if(Z){var Y=0;(function(){if(typeof Z.GetVariable!=D){var ab=Z.GetVariable("$version");if(ab){ab=ab.split(" ")[1].split(",");M.pv=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}else{if(Y<10){Y++;setTimeout(arguments.callee,10);return}}X.removeChild(aa);Z=null;H()})()}else{H()}}function H(){var ag=o.length;if(ag>0){for(var af=0;af<ag;af++){var Y=o[af].id;var ab=o[af].callbackFn;var aa={success:false,id:Y};if(M.pv[0]>0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad<ac;ad++){if(X[ad].getAttribute("name").toLowerCase()!="movie"){ah[X[ad].getAttribute("name")]=X[ad].getAttribute("value")}}P(ai,ah,Y,ab)}else{p(ae);if(ab){ab(aa)}}}}}else{w(Y,true);if(ab){var Z=z(Y);if(Z&&typeof Z.SetVariable!=D){aa.success=true;aa.ref=Z}ab(aa)}}}}}function z(aa){var X=null;var Y=c(aa);if(Y&&Y.nodeName=="OBJECT"){if(typeof Y.SetVariable!=D){X=Y}else{var Z=Y.getElementsByTagName(r)[0];if(Z){X=Z}}}return X}function A(){return !a&&F("6.0.65")&&(M.win||M.mac)&&!(M.wk&&M.wk<312)}function P(aa,ab,X,Z){a=true;E=Z||null;B={success:false,id:X};var ae=c(X);if(ae){if(ae.nodeName=="OBJECT"){l=g(ae);Q=null}else{l=ae;Q=X}aa.id=R;if(typeof aa.width==D||(!/%$/.test(aa.width)&&parseInt(aa.width,10)<310)){aa.width="310"}if(typeof aa.height==D||(!/%$/.test(aa.height)&&parseInt(aa.height,10)<137)){aa.height="137"}j.title=j.title.slice(0,47)+" - Flash Player Installation";var ad=M.ie&&M.win?"ActiveX":"PlugIn",ac="MMredirectURL="+O.location.toString().replace(/&/g,"%26")+"&MMplayerType="+ad+"&MMdoctitle="+j.title;if(typeof ab.flashvars!=D){ab.flashvars+="&"+ac}else{ab.flashvars=ac}if(M.ie&&M.win&&ae.readyState!=4){var Y=C("div");X+="SWFObjectNew";Y.setAttribute("id",X);ae.parentNode.insertBefore(Y,ae);ae.style.display="none";(function(){if(ae.readyState==4){ae.parentNode.removeChild(ae)}else{setTimeout(arguments.callee,10)}})()}u(aa,ab,X)}}function p(Y){if(M.ie&&M.win&&Y.readyState!=4){var X=C("div");Y.parentNode.insertBefore(X,Y);X.parentNode.replaceChild(g(Y),X);Y.style.display="none";(function(){if(Y.readyState==4){Y.parentNode.removeChild(Y)}else{setTimeout(arguments.callee,10)}})()}else{Y.parentNode.replaceChild(g(Y),Y)}}function g(ab){var aa=C("div");if(M.win&&M.ie){aa.innerHTML=ab.innerHTML}else{var Y=ab.getElementsByTagName(r)[0];if(Y){var ad=Y.childNodes;if(ad){var X=ad.length;for(var Z=0;Z<X;Z++){if(!(ad[Z].nodeType==1&&ad[Z].nodeName=="PARAM")&&!(ad[Z].nodeType==8)){aa.appendChild(ad[Z].cloneNode(true))}}}}}return aa}function u(ai,ag,Y){var X,aa=c(Y);if(M.wk&&M.wk<312){return X}if(aa){if(typeof ai.id==D){ai.id=Y}if(M.ie&&M.win){var ah="";for(var ae in ai){if(ai[ae]!=Object.prototype[ae]){if(ae.toLowerCase()=="data"){ag.movie=ai[ae]}else{if(ae.toLowerCase()=="styleclass"){ah+=' class="'+ai[ae]+'"'}else{if(ae.toLowerCase()!="classid"){ah+=" "+ae+'="'+ai[ae]+'"'}}}}}var af="";for(var ad in ag){if(ag[ad]!=Object.prototype[ad]){af+='<param name="'+ad+'" value="'+ag[ad]+'" />'}}aa.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+ah+">"+af+"</object>";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;ab<ac;ab++){I[ab][0].detachEvent(I[ab][1],I[ab][2])}var Z=N.length;for(var aa=0;aa<Z;aa++){y(N[aa])}for(var Y in M){M[Y]=null}M=null;for(var X in swfobject){swfobject[X]=null}swfobject=null})}}();return{registerObject:function(ab,X,aa,Z){if(M.w3&&ab&&X){var Y={};Y.id=ab;Y.swfVersion=X;Y.expressInstall=aa;Y.callbackFn=Z;o[o.length]=Y;w(ab,false)}else{if(Z){Z({success:false,id:ab})}}},getObjectById:function(X){if(M.w3){return z(X)}},embedSWF:function(ab,ah,ae,ag,Y,aa,Z,ad,af,ac){var X={success:false,id:ah};if(M.w3&&!(M.wk&&M.wk<312)&&ab&&ah&&ae&&ag&&Y){w(ah,false);K(function(){ae+="";ag+="";var aj={};if(af&&typeof af===r){for(var al in af){aj[al]=af[al]}}aj.data=ab;aj.width=ae;aj.height=ag;var am={};if(ad&&typeof ad===r){for(var ak in ad){am[ak]=ad[ak]}}if(Z&&typeof Z===r){for(var ai in Z){if(typeof am.flashvars!=D){am.flashvars+="&"+ai+"="+Z[ai]}else{am.flashvars=ai+"="+Z[ai]}}}if(F(Y)){var an=u(aj,am,ah);if(aj.id==ah){w(ah,true)}X.success=true;X.ref=an}else{if(aa&&A()){aj.data=aa;P(aj,am,ah,ac);return}else{w(ah,true)}}if(ac){ac(X)}})}else{if(ac){ac(X)}}},switchOffAutoHideShow:function(){m=false},ua:M,getFlashPlayerVersion:function(){return{major:M.pv[0],minor:M.pv[1],release:M.pv[2]}},hasFlashPlayerVersion:F,createSWF:function(Z,Y,X){if(M.w3){return u(Z,Y,X)}else{return undefined}},showExpressInstall:function(Z,aa,X,Y){if(M.w3&&A()){P(Z,aa,X,Y)}},removeSWF:function(X){if(M.w3){y(X)}},createCSS:function(aa,Z,Y,X){if(M.w3){v(aa,Z,Y,X)}},addDomLoadEvent:K,addLoadEvent:s,getQueryParamValue:function(aa){var Z=j.location.search||j.location.hash;if(Z){if(/\?/.test(Z)){Z=Z.split("?")[1]}if(aa==null){return L(Z)}var Y=Z.split("&");for(var X=0;X<Y.length;X++){if(Y[X].substring(0,Y[X].indexOf("="))==aa){return L(Y[X].substring((Y[X].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(a){var X=c(R);if(X&&l){X.parentNode.replaceChild(l,X);if(Q){w(Q,true);if(M.ie&&M.win){l.style.display="block"}}if(E){E(B)}}a=false}}}}();
+cooliris.embed.onJSLoaded("swfobject");
diff --git a/modules/akismet/views/admin_akismet_stats.html.php b/modules/akismet/views/admin_akismet_stats.html.php
index 32908ba01b..7f1479fa8e 100644
--- a/modules/akismet/views/admin_akismet_stats.html.php
+++ b/modules/akismet/views/admin_akismet_stats.html.php
@@ -6,6 +6,6 @@
 </script>
 <div id="g-akismet-stats">
   <iframe id="g-akismet-external-stats" width="100%" height="500" frameborder="0"
-          src="http://<?= $api_key ?>.web.akismet.com/1.0/user-stats.php?blog=<?= urlencode($blog_url) ?>">
+          src="https://akismet.com/1.0/user-stats.php?api_key=<?= $api_key ?>&blog=<?= urlencode($blog_url) ?>">
   </iframe>
 </div>
diff --git a/modules/slideshow/helpers/slideshow_theme.php b/modules/slideshow/helpers/slideshow_theme.php
index bb02212733..fb695241b1 100644
--- a/modules/slideshow/helpers/slideshow_theme.php
+++ b/modules/slideshow/helpers/slideshow_theme.php
@@ -20,7 +20,7 @@
 class slideshow_theme_Core {
   static function page_bottom($theme) {
     $proto = request::protocol();
-    return "<script src=\"$proto://e.cooliris.com/slideshow/v/37732/go.js\" " .
+    return "<script src=\"lib/cooliris/go.js\" " .
       "type=\"text/javascript\"></script>";
   }
 }