diff --git a/README.md b/README.md
index f7bed35..939e4a2 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ The eBook reader uses persistence to cache the files from an epub for offline vi
 
 Currently, there is not a great cross browser solution for dynamic file storage. Chrome supports the Filesystem API, Firefox/IE support indexedDB, and Safari/Safari Mobile support Web SQL.
 
-The reader detects the storage capabilities of the browser and picks the best available option. When internet is available, the entire book is loaded into storage. When possible, Web Workers is used to handle loading and saving the files in a different thread, so as not to interfere with the reading experience.
+The reader detects the storage capabilities of the browser and picks the best available option. When internet is available, the entire book is loaded into storage. When possible, Web Workers is used to handle loading and saving the files, so as not to interfere with the reading experience.
 
 The browser tells the reader when there is Internet connectivity, and by listening to those events, it automatically switches to using the stored files. Users can also manually switch to offline mode in the interface.
 
diff --git a/dev.html b/dev.html
index 056207e..3a8e3c2 100755
--- a/dev.html
+++ b/dev.html
@@ -21,6 +21,8 @@
             document.onreadystatechange = function () {  
               if (document.readyState == "complete") {
                 FP.filePath = "/fpjs/";
+                fileStorage.filePath = FP.filePath + "libs/";
+                
                 FP.VERSION = "0.1.5";
                 FPR.app.init();
               }  
@@ -33,14 +35,9 @@
         <!-- Render -->
         <script src="fpjs/render/base.js"></script>
         <script src="fpjs/render/core.js"></script>
-        <script src="fpjs/render/queue.js"></script>
         <script src="fpjs/render/unarchiver.js"></script>
-        <script src="fpjs/render/storage.js"></script>
-        <script src="fpjs/render/storage_none.js"></script>
-        <script src="fpjs/render/storage_ram.js"></script>
-        <script src="fpjs/render/storage_websql.js"></script>
-        <script src="fpjs/render/storage_indexeddb.js"></script>
-        <script src="fpjs/render/storage_filesystem.js"></script>
+        <script src="fpjs/libs/fileStorage.min.js"></script>
+
         <script src="fpjs/render/events.js"></script>
         <script src="fpjs/render/hooks.js"></script>
         <script src="fpjs/render/book.js"></script>
diff --git a/dist/.DS_Store b/dist/.DS_Store
index 08e4685..340701b 100644
Binary files a/dist/.DS_Store and b/dist/.DS_Store differ
diff --git a/dist/hooks/hooks.min.js b/dist/hooks/hooks.min.js
index b2d65bb..762d464 100644
--- a/dist/hooks/hooks.min.js
+++ b/dist/hooks/hooks.min.js
@@ -1,2 +1,2 @@
-/*! FuturePress - v0.1.0 - 2013-03-27 */
+/*! FuturePress - v0.1.0 - 2013-03-28 */
 FP.Hooks.register("beforeChapterDisplay").endnotes=function(e,t){var n=t.doc.querySelectorAll("a[href]"),r=Array.prototype.slice.call(n),i="epub:type",s="noteref",o={};FP.core.addCss("css/popup.css",!1,t.doc.head),r.forEach(function(e){function d(){var n,r=t.iframe.height,i=t.iframe.width,s,f,d=225;p||(f=a.cloneNode(!0),p=f.querySelector("p")),o[u]||(o[u]=document.createElement("div"),o[u].setAttribute("class","popup"),pop_content=document.createElement("div"),o[u].appendChild(pop_content),pop_content.appendChild(p),pop_content.setAttribute("class","pop_content"),t.bodyEl.appendChild(o[u]),o[u].addEventListener("mouseover",v,!1),o[u].addEventListener("mouseout",m,!1),t.book.listenUntil("book:pageChanged","book:chapterDestroy",g),t.book.listenUntil("book:pageChanged","book:chapterDestroy",m)),f=o[u],itemRect=e.getBoundingClientRect(),c=l.left,h=l.top,f.classList.add("show"),f.style.left=c-itemRect.width/2+"px",f.style.top=h+"px",popRect=f.getBoundingClientRect(),d>r/2.5&&(d=r/2.5,pop_content.style.maxHeight=d+"px"),n.height+h>=r-25?(f.style.top=h-popRect.height+"px",f.classList.add("above")):f.classList.remove("above"),c-popRect.width<=0?(f.style.left=c+"px",f.classList.add("left")):f.classList.remove("left"),c+popRect.width/2>=i?(f.style.left=c-300+"px",popRect=f.getBoundingClientRect(),f.style.left=c-popRect.width+"px",popRect.height+h>=r-25?(f.style.top=h-popRect.height+"px",f.classList.add("above")):f.classList.remove("above"),f.classList.add("right")):f.classList.remove("right")}function v(){o[u].classList.add("on")}function m(){o[u].classList.remove("on")}function g(){setTimeout(function(){o[u].classList.remove("show")},100)}var n=e.getAttribute(i),r,u,a,f,l,c,h,p;if(n!=s)return;r=e.getAttribute("href"),u=r.replace("#",""),a=t.doc.getElementById(u),e.addEventListener("mouseover",d,!1),e.addEventListener("mouseout",g,!1)}),e&&e()},FP.Hooks.register("beforeChapterDisplay").smartimages=function(e,t){var n=t.doc.querySelectorAll("img"),r=Array.prototype.slice.call(n),i=t.iframe.height,s;r.forEach(function(e){function n(){var n=e.getBoundingClientRect(),r=n.height,s=n.top;i=t.iframe.height,r+s>=i?s<i/2?e.style.maxHeight=i-s+"px":(e.style.maxHeight=(r<i?r:i)+"px",e.style.marginTop=i-s+"px"):(e.style.removeProperty("max-height"),e.style.removeProperty("margin-top"))}t.book.listenUntil("book:resized","book:chapterDestroy",n),n()}),e&&e()},FP.Hooks.register("beforeChapterDisplay").transculsions=function(e,t){var n=t.doc.querySelectorAll("[transclusion]"),r=Array.prototype.slice.call(n);r.forEach(function(e){function l(){u=i,a=s,u>t.colWidth&&(f=t.colWidth/u,u=t.colWidth,a*=f),r.width=u,r.height=a}var n=e.getAttribute("ref"),r=document.createElement("iframe"),i=e.getAttribute("width"),s=e.getAttribute("height"),o=e.parentNode,u=i,a=s,f;l(),t.book.listenUntil("book:resized","book:chapterDestroy",l),r.src=n,o.replaceChild(r,e)}),e&&e()};
\ No newline at end of file
diff --git a/dist/libs/fileStorage.min.js b/dist/libs/fileStorage.min.js
new file mode 100644
index 0000000..9346f4e
--- /dev/null
+++ b/dist/libs/fileStorage.min.js
@@ -0,0 +1 @@
+var fileStorage=fileStorage||{};fileStorage.core=fileStorage.core||{},fileStorage.core.dataURLToBlob=function(e){var t=";base64,";if(e.indexOf(t)==-1){var n=e.split(","),r=n[0].split(":")[1],i=n[1];return new Blob([i],{type:r})}var n=e.split(t),r=n[0].split(":")[1],i=window.atob(n[1]),s=i.length,o=new Uint8Array(s);for(var u=0;u<s;++u)o[u]=i.charCodeAt(u);return new Blob([o],{type:r})},fileStorage.core.loadFile=function(e,t,n){var r=new XMLHttpRequest;return this.succeeded=function(e){t&&t(e)},this.failed=function(e){console.log("Error:",e)},this.start=function(){var t=this;r.open("GET",e,!0),r.responseType="blob",r.onload=function(e){this.status==200&&t.succeeded(this.response)},r.onerror=function(e){t.failed(this.status)},r.send()},{start:this.start,succeeded:this.succeeded,failed:this.failed}},fileStorage.Queue=function(e,t){this._q=[],this._tasks={},this.idCount=0,this.concurrency=0,this.workers=[],this.available=[],typeof e=="string"&&(this.workerStr=e,this.addWorkers(t||1)),typeof e=="function"&&(this.workerFunction=e,this.addFakeWorkers(t||1))},fileStorage.Queue.prototype.addWorkers=function(e){var t=this.concurrency,n=t+e;for(var r=t;r<e;r++){var i=new Worker(this.workerStr);this.workers.push(i),this.available.push(r)}this.concurrency=e},fileStorage.Queue.prototype.addFakeWorkers=function(e){var t=this.concurrency,n=t+e;for(var r=t;r<e;r++){var i=new fileStorage.FakeWorker(this.workerFunction);this.workers.push(i),this.available.push(r)}this.concurrency=e},fileStorage.Queue.prototype.add=function(e,t,n){var r=this.idCount;return this._tasks[r]={msg:e,callback:t||function(){}},n?(this._q.unshift(r),this.running||this.run()):this._q.push(r),this.idCount++,r},fileStorage.Queue.prototype.addGroup=function(e,t){var n=this,r=e.length,i=function(){r--,r<=0&&t()};return e.forEach(function(e){n.add(e,i)}),this.running||this.run(),i},fileStorage.Queue.prototype.run=function(e){if(this.running)return;this.running=!0;while(this.available.length){var t=this.next();if(!t)break}},fileStorage.Queue.prototype.find=function(e){},fileStorage.Queue.prototype.next=function(){var e=this,t=this._q.shift(),n,r,i;return typeof t=="undefined"?(this.running=!1,!1):(n=this._tasks[t],r=this.available.pop(),i=this.workers[r],i.postMessage(n.msg),i.onmessage=function(i){var s=i.data;n.callback(s),delete e._tasks[t],e.available.push(r),e.next()},i)},fileStorage.Queue.prototype.empty=function(){this._q=[],this._tasks={}},fileStorage.FakeWorker=function(e){this.func=e},fileStorage.FakeWorker.prototype.postMessage=function(e){setTimeout(function(){this.func(e,this.onmessage)}.bind(this),1)},fileStorage.FakeWorker.prototype.onmessage=function(e){},fileStorage.FakeWorker.prototype.close=function(e){},fileStorage.storage=function(e){return this._supported={},this._storageType=!1,this._store=!1,this.determineStorageMethod(e),this},fileStorage.storage.prototype.storageMethod=function(e){console.log("storageMethod",e),!e||typeof fileStorage.store[e]=="undefined"?this._storageType="none":this._storageType=e,this._store=new fileStorage.store[this._storageType],this._store.failed=this._error},fileStorage.storage.prototype.determineStorageMethod=function(e){var t=["filesystem","indexeddb","websql","ram"],n="none";this.checkSupport();if(e&&(e=="none"||this._supported[e]))n=e;else for(var r=-1,i=t.length;++r<i;)if(this._supported[t[r]]){n=t[r];break}this.storageMethod(n)},fileStorage.storage.prototype.get=function(e,t){return this._store.get(e,t)},fileStorage.storage.prototype.batch=function(e,t){return this._store.batch(e,t)},fileStorage.storage.prototype.getURL=function(e){return this._store.getURL(e)},fileStorage.storage.prototype.save=function(e,t,n){return this._store.save(e,t,n)},fileStorage.storage.prototype._error=function(e){console.log("error",e)},fileStorage.storage.prototype.getStorageType=function(){return this._storageType},fileStorage.storage.prototype.checkSupport=function(){var e="filesystem indexeddb websql ram".split(" "),t="RequestFileSystem IndexedDB openDatabase URL".split(" ");for(var n=-1,r=e.length;++n<r;){var i=e[n],s=t[n];this._supported[i]=this.testSupport(s)}},fileStorage.storage.prototype.testSupport=function(e){prefixes=["webkit","moz","o","ms"];for(var t=-1,n=prefixes.length;++t<n;)if(window[prefixes[t]+e])return!0;return e in window},fileStorage.store=fileStorage.store||{},fileStorage.store.filesystem=function(){function e(e){if(d){e(d);return}p(m,v,function(t){d=t,e(t)},f)}function t(e){}function n(e,t){h.addGroup(e,t)}function r(e,t){if(typeof c[e]!="undefined")return c[e];i(e,function(n){var r;n?(r=a(e,n),typeof t!="undefined"&&t(r)):h.add(e,function(n){i(n,function(r){n=a(e,r),typeof t!="undefined"&&t(n)})},!0)})}function i(t,n){var r,i;e(function(e){e.root.getFile(t,{},function(e){n(e)},function(){n(!1)})})}function s(e,t){var n=new fileStorage.core.loadFile(e);n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=f,n.start()}function o(t,n,r){e(function(e){var i=t.split("/").slice(0,-1);u(e.root,i),e.root.getFile(t,{create:!0},function(e){e.createWriter(function(e){e.onwriteend=function(e){r&&r(e)},e.onerror=function(e){f(err)},e.write(n)})},f)})}function u(e,t){if(t[0]=="."||t[0]=="")t=t.slice(1);e.getDirectory(t[0],{create:!0},function(e){t.length&&u(e,t.slice(1))},f)}function a(e,t){var n;return typeof c[e]!="undefined"?c[e]:(n=t.toURL(),c[e]=n,n)}function f(e){typeof this.failed=="undefined"?console.log("Error: ",l(e)):this.failed(e)}function l(e){switch(e.code){case FileError.QUOTA_EXCEEDED_ERR:return"QUOTA_EXCEEDED_ERR";case FileError.NOT_FOUND_ERR:return"NOT_FOUND_ERR";case FileError.SECURITY_ERR:return"SECURITY_ERR";case FileError.INVALID_MODIFICATION_ERR:return"INVALID_MODIFICATION_ERR";case FileError.INVALID_STATE_ERR:return"INVALID_STATE_ERR";case FileError.TYPE_MISMATCH_ERR:return"TYPE_MISMATCH_ERR";default:return"Unknown Error:"+e.code}}var c={},h=new fileStorage.Queue((fileStorage.filePath||"")+"loader_filesystem.js",6),p=window.requestFileSystem||window.webkitRequestFileSystem,d;const v=5242880,m=TEMPORARY;return{get:r,preload:t,batch:n,getURL:a,save:o}},fileStorage.store=fileStorage.store||{},fileStorage.store.indexeddb=function(){function e(e,t){var n={data:null},r=e;o(e,function(e){u(r,e),t(n)})}function t(e){var t;if(d){e(d);return}t=indexedDB.open(m),t.onsuccess=function(n){d=t.result,d.onerror=function(e){console.log("Database error: "+e.target.errorCode)},e&&e(d)},t.onerror=function(e){},t.onupgradeneeded=function(e){var t=e.target.result,n=t.createObjectStore("files",{keyPath:"path"})}}function n(e){}function r(e,t){h.addGroup(e,t)}function i(e,t){if(typeof c[e]!="undefined"){t(c[e]);return}s(e,function(n){var r;n?(r=a(e,n),typeof t!="undefined"&&t(r)):h.add(e,function(n){r=a(e,n),typeof t!="undefined"&&t(r)},!0)})}function s(e,n){var r,i;t(function(t){i=t.transaction(["files"]).objectStore("files"),r=i.get(e),r.onerror=function(e){console.log("error:",e),n(!1)},r.onsuccess=function(t){var i=r.result.file;i?n(i):console.log("File not found",e)}})}function o(e,t){var n=new fileStorage.core.loadFile(e);n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=f,n.start()}function u(e,n){var r={path:e,file:n},i;t(function(e){var t=e.transaction(["files"],"readwrite"),n=t.objectStore("files");i=n.put(r),i.onerror=function(e){console.log("failed: "+e.target.errorCode)},i.onsuccess=function(e){}})}function a(e,t){var n;if(typeof c[e]!="undefined"){callback(c[e]);return}return n=v.createObjectURL(t),c[e]=n,n}function f(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var l={},c={},h=new fileStorage.Queue(e,6),p=window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB,d,v=window.URL;const m="fileStorage_db";return{get:i,preload:n,batch:r,getURL:a,save:u}},fileStorage.store=fileStorage.store||{},fileStorage.store.none=function(){function e(e,t){var n={data:null},r=i(e);r?(n.data=r,t(n)):s(e,function(e){n.data=e,t(n)})}function t(e){var t=i(e);t||l.add(e)}function n(e,t){l.addGroup(e,t)}function r(e,t){var n=i(e),r;n?typeof t!="undefined"&&t(n):l.add(e,function(n){typeof t!="undefined"&&t(e)},!0)}function i(e){var t=a[e];return typeof t!="undefined"?t:!1}function s(e,t){var n=new fileStorage.core.loadFile(e);n.succeeded=function(n){o(e,n),typeof t!="undefined"&&t(n)},n.failed=u,n.start()}function o(e,t){if(a[e])return;a[e]=e}function u(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var a={},f={},l=new fileStorage.Queue(e,6);return{get:r,preload:t,batch:n}},fileStorage.store=fileStorage.store||{},fileStorage.store.ram=function(){function e(e,t){var n={data:null},r=i(e);r?(n.data=r,t(n)):s(e,function(e){n.data=e,t(n)})}function t(e){var t=i(e);t||c.add(e)}function n(e,t){c.addGroup(e,t)}function r(e,t){var n=i(e),r;n?(r=u(e,n),typeof t!="undefined"&&t(r)):c.add(e,function(n){r=u(e,n),typeof t!="undefined"&&t(r)},!0)}function i(e){var t=f[e];return typeof t!="undefined"?t:!1}function s(e,t){var n=new fileStorage.core.loadFile(e);n.succeeded=function(n){o(e,n),typeof t!="undefined"&&t(n)},n.failed=a,n.start()}function o(e,t){if(f[e])return;f[e]=t}function u(e,t){var n;return typeof l[e]!="undefined"?l[e]:(n=h.createObjectURL(t),l[e]=n,n)}function a(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var f={},l={},c=new fileStorage.Queue(e,6),h=window.URL||window.webkitURL;return{get:r,preload:t,batch:n}},fileStorage.store=fileStorage.store||{},fileStorage.store.websql=function(){function e(e,t){var n={data:null},r=e;o(e,function(e){u(r,e),t(n)})}function t(e){if(h){e(h);return}h=openDatabase(d,v,m,g);if(!h){console.error("Database error");return}h.transaction(function(t){t.executeSql("CREATE TABLE IF NOT EXISTS "+y+" (path TEXT PRIMARY KEY ASC UNIQUE, file BLOB, type TEXT)"),e&&e(h)})}function n(e){}function r(e,t){c.addGroup(e,t)}function i(e,t){if(typeof l[e]!="undefined"){t(l[e]);return}s(e,function(n){var r;n?(r=a(e,n),typeof t!="undefined"&&t(r)):c.add(e,function(n){r=a(e,n),typeof t!="undefined"&&t(r)},!0)})}function s(e,n){var r={};console.log("path",e),r.onError=function(e,t){console.log("get Error",t),n(!1)},r.onSuccess=function(e,t){var r;t.rows.length&&(r=t.rows.item(0),n(r.file))},t(function(t){t.transaction(function(t){t.executeSql("SELECT * FROM "+y+" WHERE path='"+e+"' LIMIT 1",[],r.onSuccess,r.onError)})})}function o(e,t){var n=new fileStorage.core.loadFile(e,!1,"arraybuffer");n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=f,n.start()}function u(e,n){var r={},i=new FileReader,s;n instanceof Blob||console.log("Not blob"),i.onload=function(i){s=i.target.result,t(function(t){t.transaction(function(t){t.executeSql("REPLACE INTO "+y+" (path, file, type) VALUES (?,?,?)",[e,s,n.type],r.onSuccess,r.onError)})})},i.onerror=function(e){console.log("err",e)},i.readAsDataURL(n),r.onError=function(e,t){console.log("failed: ",t)},r.onSuccess=function(t){console.log("saved",e)}}function a(e,t){var n,r;if(typeof l[e]!="undefined"){callback(l[e]);return}return r=fileStorage.core.dataURLToBlob(t),n=p.createObjectURL(r),l[e]=n,n}function f(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var l={},c=new fileStorage.Queue(e,6),h,p=window.URL||window.webkitURL;const d="fileStoragejs_db",v="1",m="cache for files",g=5242880,y="files";return{get:i,preload:n,batch:r,getURL:a,save:u}};
\ No newline at end of file
diff --git a/dist/libs/loader_filesystem.js b/dist/libs/loader_filesystem.js
new file mode 100644
index 0000000..95a6767
--- /dev/null
+++ b/dist/libs/loader_filesystem.js
@@ -0,0 +1 @@
+var fileStorage=fileStorage||{},_requestFileSystem=self.requestFileSystem||self.webkitRequestFileSystem;const DBSIZE=5242880,DBTYPE=TEMPORARY;self.onmessage=function(e){var t=e.data;self.request(t,function(e){self.save(t,e,function(){self.postMessage(t)})})},self.openFs=function(e){if(self._fs){e&&e(self._fs);return}_requestFileSystem(DBTYPE,DBSIZE,function(t){self._fs=t,e&&e(t)},self.failure)},self.request=function(e,t){var n=new self.loadFile(e);n.succeeded=function(e){t&&t(e)},n.failed=function(e){self.postMessage("failed: "+e.toString())},n.start()},self.save=function(e,t,n){self.openFs(function(r){var i=e.split("/").slice(0,-1);self.createDir(r.root,i),r.root.getFile(e,{create:!0},function(r){r.createWriter(function(r){r.onwriteend=function(e){n(e)},r.onerror=function(t){self.postMessage("write error:"+self.errorHandler(err)+" path="+e)},r.write(t)})},self.failure)})},self.createDir=function(e,t){if(t[0]=="."||t[0]=="")t=t.slice(1);e.getDirectory(t[0],{create:!0},function(e){t.length&&createDir(e,t.slice(1))},self.failure)},self.failure=function(e){self.postMessage("failed: "+self.errorHandler(e))},self.errorHandler=function(e){switch(e.code){case FileError.QUOTA_EXCEEDED_ERR:return"QUOTA_EXCEEDED_ERR";case FileError.NOT_FOUND_ERR:return"NOT_FOUND_ERR";case FileError.SECURITY_ERR:return"SECURITY_ERR";case FileError.INVALID_MODIFICATION_ERR:return"INVALID_MODIFICATION_ERR";case FileError.INVALID_STATE_ERR:return"INVALID_STATE_ERR";default:return"Unknown Error"}},self.loadFile=function(e,t){var n=new XMLHttpRequest;return this.succeeded=function(e){t&&t(e)},this.failed=function(e){console.log("Error:",e)},this.start=function(){var t=this;n.open("GET",e,!0),n.responseType="blob",n.onload=function(e){this.status==200&&t.succeeded(this.response)},n.onerror=function(e){t.failed(this.status)},n.send()},{start:this.start,succeeded:this.succeeded,failed:this.failed}},self.openFs();
\ No newline at end of file
diff --git a/dist/reader.min.js b/dist/reader.min.js
index c47d2fa..5fd8236 100644
--- a/dist/reader.min.js
+++ b/dist/reader.min.js
@@ -1,2 +1,2 @@
-/*! FuturePress - v0.1.0 - 2013-03-27 */
+/*! FuturePress - v0.1.0 - 2013-03-28 */
 var FPR=FPR||{};FPR.app={},FPR.app.init=function(e){"use strict";function s(n){var s=window.location.search.match(/book=(.*)/),n=n||(s?s[1]:"moby-dick");FP.core.crossBrowserColumnCss(),i=e(window).width(),i>550?e("#main").width(i-r):e("#main").width(i),a(),t=new FP.Book("area"),t.listen("book:metadataReady",o),t.listen("book:tocReady",u),t.listen("book:bookReady",l),t.listen("book:chapterReady",p),t.listen("book:online",c),t.listen("book:offline",h),t.start(n),e(function(){d()})}function o(){var n=t.getTitle(),r=t.getCreator(),i=e("#book-title"),s=e("#chapter-title"),o=e("#title-seperator");document.title=n+" – "+r,i.html(n),s.html(r),o.show()}function u(){var n=t.getTOC(),r=e("#toc"),i,s;r.empty(),s=f(n,1),r.append(s),i=e(".toc_link"),i.on("click",function(n){var r=e(this),i=r.data("url");e(".openChapter").removeClass("openChapter"),r.parents("li").addClass("openChapter"),t.useHash||(t.show(i),n.preventDefault())})}function a(){var n="";localStorage.getItem("fontSize")?n=localStorage.getItem("fontSize"):(n="medium",localStorage.setItem("fontSize",n));var r=e("#settingsPanel");r.append("<ul></ul>");var i=e("<li><h3></h3></li>"),s=e("<input type='radio' name='fontSize' value='x-small'><span class='xsmall'>Extra Small</span><br><input type='radio' name='fontSize' value='small'><span class='small'>Small</span><br><input type='radio' name='fontSize' value='medium'><span class='medium'>Medium</span><br><input type='radio' name='fontSize' value='large'><span class='large'>Large</span><br><input type='radio' name='fontSize' value='x-large'><span class='xlarge'>Extra Large</span>");i.find("h3").text("Font Size").after(s),r.find("ul").append(i);var o=e('input[name="fontSize"]');o.each(function(){e(this).attr("value")==n&&e(this).attr("checked","checked"),e(this).on("click",function(){localStorage.setItem("fontSize",e(this).attr("value")),t.iframe.contentDocument.location.reload(!0)})})}function f(t,n){var r=e("<ul>"),i=n==1?"chapter":"section";return t.forEach(function(t){var s,o=e("<li id='toc-"+t.id+"'>"),u=e("<a class='toc_link "+i+"' href='#/"+t.href+"' data-url='"+t.href+"'>"+t.label+"</a>");o.append(u),t.subitems&&t.subitems.length&&(n++,s=f(t.subitems,n),o.append(s)),r.append(o)}),r}function l(){var n=e("#divider"),r=e("#loader");r.hide(),t.single||n.addClass("show")}function c(){var t=e("#store");n=!1,t.attr("src","img/save.png")}function h(){var t=e("#store");n=!0,t.attr("src","img/saved.png")}function p(t){var n=t.msg,r=e("#toc-"+n),i=e(".currentChapter");r.length&&(i.removeClass("currentChapter"),r.addClass("currentChapter"))}function d(){function y(){f.addClass("open"),u.addClass("closed"),c.attr("src","img/close.png")}function b(){a.css("pointer-events","visible"),f.removeClass("open"),u.removeClass("closed"),c.attr("src","img/menu-icon.png")}function w(){v.hide(),d.show()}function E(){d.hide(),v.show()}var s=e("#next"),o=e("#prev"),u=e("#main"),a=e("#area"),f=e("#sidebar"),l=e("#open"),c=l.find("img"),h=e("#network"),p=e("#setting"),d=e("#settingsPanel"),v=e("#toc"),m=e(window);m.on("resize",function(){i=e(window).width(),i>550?u.width(i-r):u.width(i)}),s.on("click",function(){t.nextPage()}),o.on("click",function(){t.prevPage()}),p.on("click",function(){d.is(":visible")?E():w()}),m.bind("touchy-swipe",function(e,n,r,i){(i.direction="left")&&t.nextPage(),(i.direction="right")&&t.prevPage()});var g=!1;e(document).keydown(function(e){if(g)return;if(e.keyCode==37)return o.trigger("click"),g=!0,setTimeout(function(){g=!1},100),!1;if(e.keyCode==39)return s.trigger("click"),g=!0,setTimeout(function(){g=!1},100),!1}),l.on("click",function(){f.hasClass("open")?b():y()}),h.on("click",function(){n=!n,t.fromStorage(n)})}var t,n=!1,r=0,i;return s}(jQuery),jQuery.fn.extend({clickOutside:function(e,t){var n=this;return jQuery(document).on("click.offer",function(r){if(t&&jQuery.inArray(r.target,t)>-1)return;if(jQuery.contains(n[0],r.target))return;jQuery(document).off("click.offer"),e(r,n)}),this}});
\ No newline at end of file
diff --git a/dist/render.min.js b/dist/render.min.js
index 554b3f2..6b5317d 100644
--- a/dist/render.min.js
+++ b/dist/render.min.js
@@ -1,2 +1,2 @@
-/*! FuturePress - v0.1.0 - 2013-03-27 */
-var FP=FP||{};FP.VERSION="0.1.5",FP.plugins=FP.plugins||{},FP.filePath=FP.filePath||"/fpjs/",FP.Book=function(e,t){typeof e=="string"?this.el=FP.core.getEl(e):this.el=e,this.events=new FP.Events(this,this.el),this.createEvent("book:tocReady"),this.createEvent("book:metadataReady"),this.createEvent("book:spineReady"),this.createEvent("book:bookReady"),this.createEvent("book:chapterReady"),this.createEvent("book:chapterDisplayed"),this.createEvent("book:chapterDestroy"),this.createEvent("book:resized"),this.createEvent("book:stored"),this.createEvent("book:online"),this.createEvent("book:offline"),this.createEvent("book:pageChanged"),this.hooks={beforeChapterDisplay:[]},this.getHooks(),this.useHash=!0,this.initialize(this.el),this.online=navigator.onLine,this.listeners(),FP.storage.determineStorageMethod(FP.storageOverride),t&&this.display(t)},FP.Book.prototype.initialize=function(e){this.iframe=document.createElement("iframe"),this.resizeIframe(!1,this.el.clientWidth,this.el.clientHeight),this.listen("book:resized",this.resizeIframe,this),this.el.appendChild(this.iframe)},FP.Book.prototype.listeners=function(){var e=this;window.addEventListener("resize",e.onResized.bind(this),!1),window.addEventListener("offline",function(t){e.online=!1,e.tell("book:offline")},!1),window.addEventListener("online",function(t){e.online=!0,e.tell("book:online")},!1),window.addEventListener("hashchange",e.route.bind(this),!1)},FP.Book.prototype.start=function(e){var t=window.location,n=t.pathname,r=e.search("://")!=-1,i=n[0]=="/",s=[],o="/",u,a;e[e.length-1]!="/"&&(e+="/");if(this.isContained(e)){this.bookPath=e,this.bookUrl="",this.contained=!0,this.tell("book:offline"),this.online&&this.unarchive(e);return}this.bookPath=e,u=t.origin||t.protocol+"//"+t.host,r&&(this.bookUrl=e),!r&&i&&(this.bookUrl=u+"/"+e),!r&&!i&&(n.split("/").forEach(function(e){e.indexOf(".")==-1&&s.push(e)}),o=s.join("/")+"/",this.bookUrl=u+o+e);if(!this.isSaved()){if(!this.online){console.error("Not Online");return}this.parseContainer()}else this.tell("book:tocReady"),this.tell("book:metadataReady"),this.tell("book:spineReady"),this.startDisplay()},FP.Book.prototype.unarchive=function(e){var t;this.isSaved()?(this.tell("book:tocReady"),this.tell("book:metadataReady"),this.tell("book:spineReady"),this.startDisplay()):t=new FP.Unarchiver(e,function(){FP.storage.get("META-INF/container.xml",function(e){this.parseContainer(e)}.bind(this))}.bind(this))},FP.Book.prototype.isSaved=function(e){return localStorage.getItem("bookPath")!=this.bookPath||localStorage.getItem("fpjs-version")!=FP.VERSION||e==1?(localStorage.setItem("fpjs-version",FP.VERSION),localStorage.setItem("bookPath",this.bookPath),localStorage.setItem("stored",0),localStorage.setItem("spinePos",0),localStorage.setItem("chapterPos",0),localStorage.setItem("displayedPages",0),this.spinePos=0,this.stored=0,!1):(this.spinePos=parseInt(localStorage.getItem("spinePos"))||0,this.stored=parseInt(localStorage.getItem("stored"))||0,this.basePath=localStorage.getItem("basePath"),this.contentsPath=localStorage.getItem("contentsPath"),this.metadata=JSON.parse(localStorage.getItem("metadata")),this.assets=JSON.parse(localStorage.getItem("assets")),this.spine=JSON.parse(localStorage.getItem("spine")),this.spineIndexByURL=JSON.parse(localStorage.getItem("spineIndexByURL")),this.toc=JSON.parse(localStorage.getItem("toc")),this.prevChapterPos=parseInt(localStorage.getItem("chapterPos")),this.prevDisplayedPages=parseInt(localStorage.getItem("displayedPages")),!this.assets||!this.spine||!this.spineIndexByURL||!this.toc?(this.stored=0,!1):!0)},FP.Book.prototype.isContained=function(e){var t=/\.[0-9a-z]+$/i,n=t.exec(e);return!n||n[0]!=".epub"&&n[0]!=".zip"?!1:!0},FP.Book.prototype.onResized=function(){this.tell("book:resized",{width:this.el.clientWidth,height:this.el.clientHeight})},FP.Book.prototype.resizeIframe=function(e,t,n){var r,i;e?(r=e.msg.width,i=e.msg.height):(r=t,i=n),this.iframe.height=i,r%2!=0&&(r+=1),this.iframe.width=r},FP.Book.prototype.parseContainer=function(e){var t=this,n=e||this.bookUrl+"META-INF/container.xml";FP.core.loadXML(n,function(e){var n;rootfile=e.querySelector("rootfile"),n=rootfile.getAttribute("full-path").split("/"),n[1]?(t.basePath=t.bookUrl+n[0]+"/",t.contentsPath=t.basePath+n[1]):(t.basePath=t.bookUrl,t.contentsPath=t.bookUrl+n),t.contained&&(t.basePath=n[0]+"/"),localStorage.setItem("basePath",t.basePath),localStorage.setItem("contentsPath",t.contentsPath),t.contained?FP.storage.get(t.contentsPath,function(e){t.parseContents(e)}):t.parseContents()})},FP.Book.prototype.parseContents=function(e){var t=this,n=e||this.contentsPath;FP.core.loadXML(n,function(e){var n=e.querySelector("metadata"),r=e.querySelector("manifest"),i=e.querySelector("spine");t.parseMetadata(n),t.parseManifest(r),t.parseSpine(i),t.startDisplay()})},FP.Book.prototype.parseMetadata=function(e){var t=this,n=e.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/","title")[0];creator=e.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/","creator")[0],this.metadata={},this.metadata.bookTitle=n?n.childNodes[0].nodeValue:"",this.metadata.creator=creator?creator.childNodes[0].nodeValue:"",localStorage.setItem("metadata",JSON.stringify(this.metadata)),this.tell("book:metadataReady")},FP.Book.prototype.parseManifest=function(e){var t=this;this.assets={},items=Array.prototype.slice.call(e.querySelectorAll("item")),items.forEach(function(e){var n=e.getAttribute("id"),r=e.getAttribute("href");t.assets[n]=t.basePath+r,e.getAttribute("media-type")=="application/x-dtbncx+xml"&&(t.contained?FP.storage.get(t.basePath+r,function(e){t.parseTOC(e)}):t.parseTOC(t.basePath+r))}),localStorage.setItem("assets",JSON.stringify(this.assets))},FP.Book.prototype.parseSpine=function(e){var t=this;this.spine=[],this.spineIndexByID={},this.spineIndexByURL={},items=Array.prototype.slice.call(e.getElementsByTagName("itemref")),items.forEach(function(e,n){var r=e.getAttribute("idref"),i=t.assets[r];t.spine.push({id:r,href:i}),t.spineIndexByID[r]=n,t.spineIndexByURL[i]=n}),localStorage.setItem("spine",JSON.stringify(this.spine)),localStorage.setItem("spineIndexByURL",JSON.stringify(this.spineIndexByURL)),this.tell("book:spineReady")},FP.Book.prototype.parseTOC=function(e){var t=this,n=e;this.toc=[],FP.core.loadXML(n,function(e){function s(e,t){var n=[];return items=Array.prototype.slice.call(e),items.forEach(function(e){var r=e.getAttribute("id"),i=e.querySelector("content"),o=i.getAttribute("src"),u=o.split("#"),a=e.querySelector("navLabel"),f=a.textContent?a.textContent:"",l=e.querySelectorAll("navPoint")||!1,c=!1,h=e.parentNode==t;if(!h)return;l&&(c=s(l,e)),n.push({id:r,href:o,label:f,subitems:c||!1})}),n}var n=e.querySelector("navMap"),r=e.querySelector("meta[name='cover']"),i;r&&(i=r.getAttribute("content"),t.toc.push({id:i,href:t.assets[i],label:i})),t.toc=t.toc.concat(s(n.querySelectorAll("navPoint"),n)),localStorage.setItem("toc",JSON.stringify(t.toc)),t.tell("book:tocReady")})},FP.Book.prototype.destroy=function(){window.removeEventListener("resize",this.onResized,!1)},FP.Book.prototype.getTitle=function(){return this.metadata.bookTitle},FP.Book.prototype.getCreator=function(){return this.metadata.creator},FP.Book.prototype.chapterTitle=function(){return this.spine[this.spinePos].id},FP.Book.prototype.startDisplay=function(e){var t,n=this.spinePos,r=function(e){this.prevChapterPos&&n==e.pos&&this.prevDisplayedPages==e.displayedPages&&e.page(this.prevChapterPos),this.online&&!this.contained&&this.storeOffline()}.bind(this);this.tell("book:bookReady"),this.useHash&&(t=this.route(!1,r)),(!this.useHash||!t)&&this.displayChapter(this.spinePos,r)},FP.Book.prototype.show=function(e,t){var n=e.split("#"),r=n[0],i=n[1]||!1,s=r.search("://")==-1?this.basePath+r:r,o=this.spineIndexByURL[s];r||(o=this.spinePos);if(typeof o!="number")return!1;o!=this.spinePos||!this.currentChapter?this.displayChapter(o,function(e){i&&e.section(i),t&&t(e)}):(i&&this.currentChapter.section(i),t&&t(this.currentChapter))},FP.Book.prototype.displayChapter=function(e,t){var n=this;if(e>=this.spine.length)return console.log("Reached End of Book"),!1;if(e<0)return console.log("Reached Start of Book"),!1;localStorage.setItem("spinePos",e),this.spinePos=e,this.currentChapter&&this.tell("book:chapterDestroy",this.currentChapter.getID()),this.currentChapter=new FP.Chapter(this),this.currentChapter.afterLoaded=function(e){n.tell("book:chapterReady",e.getID()),t&&t(e)}},FP.Book.prototype.nextPage=function(){var e=this.currentChapter.nextPage();e||this.nextChapter()},FP.Book.prototype.prevPage=function(){var e=this.currentChapter.prevPage();e||this.prevChapter()},FP.Book.prototype.nextChapter=function(){this.spinePos++,this.displayChapter(this.spinePos)},FP.Book.prototype.prevChapter=function(){this.spinePos--,this.displayChapter(this.spinePos,function(e){e.goToChapterEnd()})},FP.Book.prototype.getTOC=function(){return this.toc},FP.Book.prototype.storeOffline=function(e){var t=FP.core.toArray(this.assets);FP.storage.batch(t,function(){this.stored=1,localStorage.setItem("stored",1),this.tell("book:stored"),e&&e()}.bind(this))},FP.Book.prototype.availableOffline=function(){return this.stored>0?!0:!1},FP.Book.prototype.fromStorage=function(e){if(this.contained)return;e?this.availableOffline?(this.online=!1,this.tell("book:offline")):this.storeOffline(function(){this.online=!1,this.tell("book:offline")}.bind(this)):(this.online=!0,this.tell("book:online"))},FP.Book.prototype.route=function(e,t){var n=window.location.hash.replace("#/","");return this.useHash&&n.length&&n!=this.prevLocation?(this.show(n,t),this.prevLocation=n,!0):!1},FP.Book.prototype.hideHashChanges=function(){this.useHash=!1},FP.Book.prototype.getHooks=function(){var e=this;plugTypes=FP.core.toArray(this.hooks),plugTypes.forEach(function(t){var n=t.ident;plugs=FP.core.toArray(FP.Hooks[n]),plugs.forEach(function(t){e.registerHook(n,t)})})},FP.Book.prototype.registerHook=function(e,t){var n=this;typeof this.hooks[e]!="undefined"?typeof t=="function"?this.hooks[e].push(t):Array.isArray(t)&&t.forEach(function(t){n.hooks[e].push(t)}):this.hooks[e]=[func]},FP.Book.prototype.triggerHooks=function(e,t,n){function s(){i--,i<=0&&t&&t()}var r,i;if(typeof this.hooks[e]=="undefined")return!1;r=this.hooks[e],i=r.length,r.forEach(function(e){e(s,n)})},FP.Chapter=function(e,t){return this.book=e,this.iframe=this.book.iframe,this.pos=t||this.book.spinePos,this.chapInfo=this.book.spine[this.pos],this.path=this.chapInfo.href,this.ID=this.chapInfo.id,this.chapterPos=1,this.leftPos=0,localStorage.setItem("chapterPos",this.chapterPos),this.book.registerHook("beforeChapterDisplay",[this.replaceLinks.bind(this),this.replaceResources.bind(this)]),this.load(),this},FP.Chapter.prototype.load=function(){var e=this.path;this.book.online&&!this.book.contained?this.setIframeSrc(e):this.loadFromStorage(e)},FP.Chapter.prototype.loadFromStorage=function(e){var t=FP.storage.get(e,this.setIframeSrc.bind(this))},FP.Chapter.prototype.setIframeSrc=function(e){var t=this;this.visible(!1),this.iframe.src=e,this.iframe.onload=function(){t.doc=t.iframe.contentDocument,t.bodyEl=t.doc.body,t.formatSpread(),t.beforeDisplay(function(){t.calcPages(),t.book.tell("book:chapterDisplayed"),t.visible(!0)}),t.afterLoaded(t),t.book.listen("book:resized",t.formatSpread,t)}},FP.Chapter.prototype.afterLoaded=function(e){},FP.Chapter.prototype.error=function(e){console.log("error",error)},FP.Chapter.prototype.formatSpread=function(){var e=2,t=800;this.colWidth&&(this.OldcolWidth=this.colWidth,this.OldspreadWidth=this.spreadWidth),this.elWidth=this.iframe.width,this.gap=this.gap||Math.ceil(this.elWidth/8),this.elWidth<t||this.book.single?(this.spread=!1,e=1,this.colWidth=Math.floor(this.elWidth/e)):(this.spread=!0,this.colWidth=Math.floor((this.elWidth-this.gap)/e),this.colWidth%2!=0&&(this.colWidth-=1)),this.spreadWidth=(this.colWidth+this.gap)*e,this.bodyEl.style.fontSize=localStorage.getItem("fontSize")||"medium",this.bodyEl.style.margin="0",this.bodyEl.style.overflow="hidden",this.bodyEl.style.width=this.elWidth,this.bodyEl.style.height=this.book.el.clientHeight+"px",this.bodyEl.style[FP.core.columnAxis]="horizontal",this.bodyEl.style[FP.core.columnGap]=this.gap+"px",this.bodyEl.style[FP.core.columnWidth]=this.colWidth+"px",this.OldcolWidth&&(this.leftPos=(this.chapterPos-1)*this.spreadWidth,this.bodyEl.scrollLeft=this.leftPos)},FP.Chapter.prototype.goToChapterEnd=function(){this.chapterEnd()},FP.Chapter.prototype.visible=function(e){if(typeof e=="undefined")return this.iframe.style.visibility;e==1?this.iframe.style.visibility="visible":e==0&&(this.iframe.style.visibility="hidden")},FP.Chapter.prototype.calcPages=function(){this.totalWidth=this.iframe.contentDocument.documentElement.scrollWidth,this.displayedPages=Math.ceil(this.totalWidth/this.spreadWidth),localStorage.setItem("displayedPages",this.displayedPages)},FP.Chapter.prototype.nextPage=function(){return this.chapterPos<this.displayedPages?(this.chapterPos++,this.leftPos+=this.spreadWidth,this.setLeft(this.leftPos),localStorage.setItem("chapterPos",this.chapterPos),this.book.tell("book:pageChanged",this.chapterPos),this.chapterPos):!1},FP.Chapter.prototype.prevPage=function(){return this.chapterPos>1?(this.chapterPos--,this.leftPos-=this.spreadWidth,this.setLeft(this.leftPos),localStorage.setItem("chapterPos",this.chapterPos),this.book.tell("book:pageChanged",this.chapterPos),this.chapterPos):!1},FP.Chapter.prototype.chapterEnd=function(){this.page(this.displayedPages)},FP.Chapter.prototype.setLeft=function(e){this.bodyEl.style.marginLeft=-e+"px"},FP.Chapter.prototype.replaceLinks=function(e){var t=this.doc.querySelectorAll("[href]"),n=Array.prototype.slice.call(t),r=this;n.forEach(function(e){var t,n=e.getAttribute("href"),i=n.search("://"),s=n[0]=="#";i!=-1?e.setAttribute("target","_blank"):e.onclick=function(){r.book.useHash?window.location.hash="#/"+n:r.book.show(n)}}),e&&e()},FP.Chapter.prototype.replaceResources=function(e){var t,n,r;if(this.book.online&&!this.book.contained||FP.storage.getStorageType()=="filesystem")return e&&e(),!1;t=this.doc.querySelectorAll("[src]"),n=Array.prototype.slice.call(t),r=n.length,n.forEach(function(t){var n=t.getAttribute("src"),i=this.book.basePath+n;FP.storage.get(i,function(n){t.setAttribute("src",n),r--,r<=0&&e&&e()})}.bind(this))},FP.Chapter.prototype.getID=function(){return this.ID},FP.Chapter.prototype.page=function(e){return e>=1&&e<=this.displayedPages?(this.chapterPos=e,this.leftPos=this.spreadWidth*(e-1),this.setLeft(this.leftPos),localStorage.setItem("chapterPos",e),!0):!1},FP.Chapter.prototype.section=function(e){var t=this.doc.getElementById(e),n,r;t&&(n=this.leftPos+t.getBoundingClientRect().left,r=Math.floor(n/this.spreadWidth)+1,this.page(r))},FP.Chapter.prototype.beforeDisplay=function(e){this.book.triggerHooks("beforeChapterDisplay",e.bind(this),this)};var FP=FP||{};FP.core={},FP.core.getEl=function(e){return document.getElementById(e)},FP.core.getEls=function(e){return document.getElementsByClassName(e)},FP.core.loadXML=function(e,t){var n=new XMLHttpRequest;n.open("GET",e,!0),n.overrideMimeType("text/xml"),n.onload=function(e){this.status==200&&t(this.responseXML)},n.send()},FP.core.loadFile=function(e,t){var n=new XMLHttpRequest;return this.succeeded=function(e){t&&t(e)},this.failed=function(e){console.log("Error:",e)},this.start=function(){var t=this;n.open("GET",e,!0),n.responseType="blob",n.onload=function(e){this.status==200&&t.succeeded(this.response)},n.onerror=function(e){t.failed(this.status)},n.send()},{start:this.start,succeeded:this.succeeded,failed:this.failed}},FP.core.crossBrowserColumnCss=function(){var e=function(e){return e.replace(/([A-Z])/g,function(e,t){return"-"+t.toLowerCase()}).replace(/^ms-/,"-ms-")};FP.core.columnAxis=Modernizr.prefixed("columnAxis")||"columnAxis",FP.core.columnGap=Modernizr.prefixed("columnGap")||"columnGap",FP.core.columnWidth=Modernizr.prefixed("columnWidth")||"columnWidth"},FP.core.toArray=function(e){var t=[];for(member in e){var n;e.hasOwnProperty(member)&&(n=e[member],n.ident=member,t.push(n))}return t},FP.core.dataURLToBlob=function(e){var t=";base64,";if(e.indexOf(t)==-1){var n=e.split(","),r=n[0].split(":")[1],i=n[1];return new Blob([i],{type:r})}var n=e.split(t),r=n[0].split(":")[1],i=window.atob(n[1]),s=i.length,o=new Uint8Array(s);for(var u=0;u<s;++u)o[u]=i.charCodeAt(u);return new Blob([o],{type:r})},FP.core.loadScript=function(e,t,n){var r,i;i=!1,r=document.createElement("script"),r.type="text/javascript",r.async=!1,r.src=e,r.onload=r.onreadystatechange=function(){!i&&(!this.readyState||this.readyState=="complete")&&(i=!0,t&&t())},n=n||document.body,n.appendChild(r)},FP.core.loadScripts=function(e,t,n){var r=e.length,i=0,s=function(){i++,r==i?t&&t():FP.core.loadScript(e[i],s,n)};FP.core.loadScript(e[i],s,n)},FP.core.addCss=function(e,t,n){var r,i;i=!1,r=document.createElement("link"),r.type="text/css",r.rel="stylesheet",r.href=e,r.onload=r.onreadystatechange=function(){!i&&(!this.readyState||this.readyState=="complete")&&(i=!0,t&&t())},n=n||document.body,n.appendChild(r)},FP.Events=function(e,t){return this.events={},t?this.el=t:this.el=document.createElement("div"),e.createEvent=this.createEvent,e.tell=this.tell,e.listen=this.listen,e.deafen=this.deafen,e.listenUntil=this.listenUntil,this},FP.Events.prototype.createEvent=function(e){var t=new CustomEvent(e);return this.events[e]=t,t},FP.Events.prototype.tell=function(e,t){var n;this.events[e]?n=this.events[e]:(console.warn("No event:",e,"defined yet, creating."),n=this.createEvent(e)),t&&(n.msg=t),this.el.dispatchEvent(n)},FP.Events.prototype.listen=function(e,t,n){if(!this.events[e]){console.warn("No event:",e,"defined yet, creating."),this.createEvent(e);return}n?this.el.addEventListener(e,t.bind(n),!1):this.el.addEventListener(e,t,!1)},FP.Events.prototype.deafen=function(e,t){this.el.removeEventListener(e,t,!1)},FP.Events.prototype.listenUntil=function(e,t,n,r){function i(){this.deafen(e,n),this.deafen(t,i)}this.listen(e,n,r),this.listen(t,i,this)},FP.Hooks=function(){"use strict";return{register:function(e){this[e]===undefined&&(this[e]={});if(typeof this[e]!="object")throw"Already registered: "+e;return this[e]}}}(),FP.Queue=function(e,t){this._q=[],this._tasks={},this.idCount=0,this.concurrency=0,this.workers=[],this.available=[],typeof e=="string"&&(this.workerStr=e,this.addWorkers(t||1)),typeof e=="function"&&(this.workerFunction=e,this.addFakeWorkers(t||1))},FP.Queue.prototype.addWorkers=function(e){var t=this.concurrency,n=t+e;for(var r=t;r<e;r++){var i=new Worker(this.workerStr);this.workers.push(i),this.available.push(r)}this.concurrency=e},FP.Queue.prototype.addFakeWorkers=function(e){var t=this.concurrency,n=t+e;for(var r=t;r<e;r++){var i=new FP.FakeWorker(this.workerFunction);this.workers.push(i),this.available.push(r)}this.concurrency=e},FP.Queue.prototype.add=function(e,t,n){var r=this.idCount;return this._tasks[r]={msg:e,callback:t||function(){}},n?(this._q.unshift(r),this.running||this.run()):this._q.push(r),this.idCount++,r},FP.Queue.prototype.addGroup=function(e,t){var n=this,r=e.length,i=function(){r--,r<=0&&t()};return e.forEach(function(e){n.add(e,i)}),this.running||this.run(),i},FP.Queue.prototype.run=function(e){if(this.running)return;this.running=!0;while(this.available.length){var t=this.next();if(!t)break}},FP.Queue.prototype.find=function(e){},FP.Queue.prototype.next=function(){var e=this,t=this._q.shift(),n,r,i;return typeof t=="undefined"?(this.running=!1,!1):(n=this._tasks[t],r=this.available.pop(),i=this.workers[r],i.postMessage(n.msg),i.onmessage=function(i){var s=i.data;n.callback(s),delete e._tasks[t],e.available.push(r),e.next()},i)},FP.Queue.prototype.empty=function(){this._q=[],this._tasks={}},FP.FakeWorker=function(e){this.func=e},FP.FakeWorker.prototype.postMessage=function(e){setTimeout(function(){this.func(e,this.onmessage)}.bind(this),1)},FP.FakeWorker.prototype.onmessage=function(e){},FP.FakeWorker.prototype.close=function(e){},FP.storage=function(){function r(e){console.log("storageMethod",e),!e||typeof FP.store[e]=="undefined"?t="none":t=e,n=new FP.store[t],n.failed=l}function i(t){var n=["filesystem","indexeddb","websqldatabase","ram"],i="none";h();if(t&&(t=="none"||e[t]))i=t;else for(var s=-1,o=n.length;++s<o;)if(e[n[s]]){i=n[s];break}r(i)}function s(e,t){return n.get(e,t)}function o(e,t){return n.preload(e,t)}function u(e,t){return n.batch(e,t)}function a(e){return n.getURL(e)}function f(e,t,r){return n.save(e,t,r)}function l(e){console.log("error",e)}function c(){return t}function h(){var t="filesystem indexeddb websqldatabase ram".split(" "),n="RequestFileSystem IndexedDB openDatabase URL".split(" ");for(var r=-1,i=t.length;++r<i;){var s=t[r],o=n[r];e[s]=p(o)}}function p(e){prefixes=["webkit","moz","o","ms"];for(var t=-1,n=prefixes.length;++t<n;)if(window[prefixes[t]+e])return!0;return e in window}var e={},t,n;return{get:s,preload:o,batch:u,storageMethod:r,getURL:a,save:f,getStorageType:c,determineStorageMethod:i}}(),FP.store=FP.store||{},FP.store.filesystem=function(){function o(e){if(r){e(r);return}n(s,i,function(t){r=t,e(t)},v)}function u(e){}function a(e,n){t.addGroup(e,n)}function f(n,r){if(typeof e[n]!="undefined")return e[n];l(n,function(e){var i;e?(i=d(n,e),typeof r!="undefined"&&r(i)):t.add(n,function(e){l(e,function(t){e=d(n,t),typeof r!="undefined"&&r(e)})},!0)})}function l(e,t){var n,r;o(function(n){n.root.getFile(e,{},function(e){t(e)},function(){t(!1)})})}function c(e,t){var n=new FP.core.loadFile(e);n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=v,n.start()}function h(e,t,n){o(function(r){var i=e.split("/").slice(0,-1);p(r.root,i),r.root.getFile(e,{create:!0},function(e){e.createWriter(function(e){e.onwriteend=function(e){n&&n(e)},e.onerror=function(e){v(err)},e.write(t)})},v)})}function p(e,t){if(t[0]=="."||t[0]=="")t=t.slice(1);e.getDirectory(t[0],{create:!0},function(e){t.length&&p(e,t.slice(1))},v)}function d(t,n){var r;return typeof e[t]!="undefined"?e[t]:(r=n.toURL(),e[t]=r,r)}function v(e){typeof this.failed=="undefined"?console.log("Error: ",m(e)):this.failed(e)}function m(e){switch(e.code){case FileError.QUOTA_EXCEEDED_ERR:return"QUOTA_EXCEEDED_ERR";case FileError.NOT_FOUND_ERR:return"NOT_FOUND_ERR";case FileError.SECURITY_ERR:return"SECURITY_ERR";case FileError.INVALID_MODIFICATION_ERR:return"INVALID_MODIFICATION_ERR";case FileError.INVALID_STATE_ERR:return"INVALID_STATE_ERR";case FileError.TYPE_MISMATCH_ERR:return"TYPE_MISMATCH_ERR";default:return"Unknown Error:"+e.code}}var e={},t=new FP.Queue(FP.filePath+"workers/loader_filesystem.js",6),n=window.requestFileSystem||window.webkitRequestFileSystem,r;const i=5242880,s=TEMPORARY;return{get:f,preload:u,batch:a,getURL:d,save:h}},FP.store=FP.store||{},FP.store.indexedDB=function(){function o(e,t){var n={data:null},r=e;h(e,function(e){p(r,e),t(n)})}function u(e){var t;if(i){e(i);return}t=indexedDB.open(s),t.onsuccess=function(n){i=t.result,i.onerror=function(e){console.log("Database error: "+e.target.errorCode)},e&&e(i)},t.onerror=function(e){},t.onupgradeneeded=function(e){var t=e.target.result,n=t.createObjectStore("files",{keyPath:"path"})}}function a(e){}function f(e,t){n.addGroup(e,t)}function l(e,r){if(typeof t[e]!="undefined"){r(t[e]);return}c(e,function(t){var i;t?(i=d(e,t),typeof r!="undefined"&&r(i)):n.add(e,function(t){i=d(e,t),typeof r!="undefined"&&r(i)},!0)})}function c(e,t){var n,r;u(function(i){r=i.transaction(["files"]).objectStore("files"),n=r.get(e),n.onerror=function(e){t(!1)},n.onsuccess=function(e){t(n.result.file)}})}function h(e,t){var n=new FP.core.loadFile(e);n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=v,n.start()}function p(e,t){var n={path:e,file:t},r;u(function(t){var i=t.transaction(["files"],"readwrite"),s=i.objectStore("files");r=s.put(n),r.onerror=function(e){console.log("failed: "+e.target.errorCode)},r.onsuccess=function(t){console.log("saved",e)}})}function d(e,n){var r;if(typeof t[e]!="undefined"){callback(t[e]);return}return r=this._URL.createObjectURL(n),t[e]=r,r}function v(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var e={},t={},n=new FP.Queue(o,6),r=window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB,i;const s="fpjs_db";return{get:l,preload:a,batch:f,getURL:d,save:p}},FP.store=FP.store||{},FP.store.none=function(){function r(e,t){var n={data:null},r=u(e);r?(n.data=r,t(n)):a(e,function(e){n.data=e,t(n)})}function i(e){var t=u(e);t||n.add(e)}function s(e,t){n.addGroup(e,t)}function o(e,t){var r=u(e),i;r?typeof t!="undefined"&&t(r):n.add(e,function(n){i=getURL(e,n),typeof t!="undefined"&&t(i)},!0)}function u(t){var n=e[t];return typeof n!="undefined"?n:!1}function a(e,t){var n=new FP.core.loadFile(e);n.succeeded=function(n){f(e,n),typeof t!="undefined"&&t(n)},n.failed=l,n.start()}function f(t,n){if(e[t])return;e[t]=t}function l(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var e={},t={},n=new FP.Queue(r,6);return{get:o,preload:i,batch:s}},FP.store=FP.store||{},FP.store.ram=function(){function i(e,t){var n={data:null},r=a(e);r?(n.data=r,t(n)):f(e,function(e){n.data=e,t(n)})}function s(e){var t=a(e);t||n.add(e)}function o(e,t){n.addGroup(e,t)}function u(e,t){var r=a(e),i;r?(i=c(e,r),typeof t!="undefined"&&t(i)):n.add(e,function(n){i=c(e,n),typeof t!="undefined"&&t(i)},!0)}function a(t){var n=e[t];return typeof n!="undefined"?n:!1}function f(e,t){var n=new FP.core.loadFile(e);n.succeeded=function(n){l(e,n),typeof t!="undefined"&&t(n)},n.failed=h,n.start()}function l(t,n){if(e[t])return;e[t]=n}function c(e,n){var i;return typeof t[e]!="undefined"?t[e]:(i=r.createObjectURL(n),t[e]=i,i)}function h(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var e={},t={},n=new FP.Queue(i,6),r=window.URL;return{get:u,preload:s,batch:o}},FP.store=FP.store||{},FP.store.websql=function(){function f(e,t){var n={data:null},r=e;v(e,function(e){m(r,e),t(n)})}function l(e){if(n){e(n);return}n=openDatabase(i,s,o,u);if(!n){console.error("Database error");return}n.transaction(function(t){t.executeSql("CREATE TABLE IF NOT EXISTS "+a+" (path TEXT PRIMARY KEY ASC UNIQUE, file BLOB, type TEXT)"),e&&e(n)})}function c(e){}function h(e,n){t.addGroup(e,n)}function p(n,r){if(typeof e[n]!="undefined"){r(e[n]);return}d(n,function(e){var i;e?(i=g(n,e),typeof r!="undefined"&&r(i)):t.add(n,function(e){i=g(n,e),typeof r!="undefined"&&r(i)},!0)})}function d(e,t){var n={};n.onError=function(e,n){console.log("get Error",n),t(!1)},n.onSuccess=function(e,n){var r;n.rows.length&&(r=n.rows.item(0),t(r.file))},l(function(t){t.transaction(function(t){t.executeSql("SELECT * FROM "+a+" WHERE path='"+e+"' LIMIT 1",[],n.onSuccess,n.onError)})})}function v(e,t){var n=new FP.core.loadFile(e);n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=y,n.start()}function m(e,t){var n={},r=new FileReader,i;r.readAsDataURL(t),r.onload=function(r){i=r.target.result,l(function(r){r.transaction(function(r){r.executeSql("REPLACE INTO "+a+" (path, file, type) VALUES (?,?,?)",[e,i,t.type],n.onSuccess,n.onError)})})},n.onError=function(e,t){console.log("failed: ",t)},n.onSuccess=function(e){}}function g(t,n){var i,s;if(typeof e[t]!="undefined"){callback(e[t]);return}return s=FP.core.dataURLToBlob(n),i=r.createObjectURL(s),e[t]=i,i}function y(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var e={},t=new FP.Queue(f,6),n,r=window.URL;const i="fpjs_db",s="1",o="cache for files",u=5242880,a="files";return{get:p,preload:c,batch:h,getURL:g,save:m}},FP.Unarchiver=function(e,t){this.libPath=FP.filePath+"libs/",this.zipUrl=e,this.callback=t,this.loadLib(function(){this.getZip(this.zipUrl)}.bind(this))},FP.Unarchiver.prototype.loadLib=function(e){typeof zip!="undefined"&&e(),FP.core.loadScript(this.libPath+"zip.js",function(){zip.workerScriptsPath=this.libPath,e()}.bind(this))},FP.Unarchiver.prototype.getZip=function(e){var t=new FP.core.loadFile(e);t.succeeded=function(e){this.getEntries(e,this.toStorage.bind(this))}.bind(this),t.failed=this.failed,t.start()},FP.Unarchiver.prototype.getEntries=function(e,t){zip.createReader(new zip.BlobReader(e),function(e){e.getEntries(t)},this.failed)},FP.Unarchiver.prototype.failed=function(e){console.log("Error:",e)},FP.Unarchiver.prototype.afterSaved=function(e){this.callback()},FP.Unarchiver.prototype.toStorage=function(e){function s(){i--,i==0&&r.afterSaved()}var t=0,n=20,r=this,i=e.length;e.forEach(function(e){setTimeout(function(e){r.saveEntryFileToStorage(e,s)},t,e),t+=n}),console.log("time",t)},FP.Unarchiver.prototype.saveEntryFileToStorage=function(e,t){var n=this;e.getData(new zip.BlobWriter,function(n){FP.storage.save(e.filename,n,t)})};
\ No newline at end of file
+/*! FuturePress - v0.1.0 - 2013-03-28 */
+var FP=FP||{};FP.VERSION="0.1.5",FP.plugins=FP.plugins||{},FP.filePath=FP.filePath||"/fpjs/",FP.Book=function(e,t){typeof e=="string"?this.el=FP.core.getEl(e):this.el=e,this.events=new FP.Events(this,this.el),this.createEvent("book:tocReady"),this.createEvent("book:metadataReady"),this.createEvent("book:spineReady"),this.createEvent("book:bookReady"),this.createEvent("book:chapterReady"),this.createEvent("book:chapterDisplayed"),this.createEvent("book:chapterDestroy"),this.createEvent("book:resized"),this.createEvent("book:stored"),this.createEvent("book:online"),this.createEvent("book:offline"),this.createEvent("book:pageChanged"),this.hooks={beforeChapterDisplay:[]},this.getHooks(),this.useHash=!0,this.initialize(this.el),this.online=navigator.onLine,this.listeners(),FP.storage=new fileStorage.storage(FP.storageOverride),t&&this.display(t)},FP.Book.prototype.initialize=function(e){this.iframe=document.createElement("iframe"),this.resizeIframe(!1,this.el.clientWidth,this.el.clientHeight),this.listen("book:resized",this.resizeIframe,this),this.el.appendChild(this.iframe)},FP.Book.prototype.listeners=function(){var e=this;window.addEventListener("resize",e.onResized.bind(this),!1),window.addEventListener("offline",function(t){e.online=!1,e.tell("book:offline")},!1),window.addEventListener("online",function(t){e.online=!0,e.tell("book:online")},!1),window.addEventListener("hashchange",e.route.bind(this),!1)},FP.Book.prototype.start=function(e){var t=window.location,n=t.pathname,r=e.search("://")!=-1,i=n[0]=="/",s=[],o="/",u,a;e[e.length-1]!="/"&&(e+="/");if(this.isContained(e)){this.bookPath=e,this.bookUrl="",this.contained=!0,this.tell("book:offline"),this.online&&this.unarchive(e);return}this.bookPath=e,u=t.origin||t.protocol+"//"+t.host,r&&(this.bookUrl=e),!r&&i&&(this.bookUrl=u+"/"+e),!r&&!i&&(n.split("/").forEach(function(e){e.indexOf(".")==-1&&s.push(e)}),o=s.join("/")+"/",this.bookUrl=u+o+e);if(!this.isSaved()){if(!this.online){console.error("Not Online");return}this.parseContainer()}else this.tell("book:tocReady"),this.tell("book:metadataReady"),this.tell("book:spineReady"),this.startDisplay()},FP.Book.prototype.unarchive=function(e){var t;this.isSaved()?(this.tell("book:tocReady"),this.tell("book:metadataReady"),this.tell("book:spineReady"),this.startDisplay()):t=new FP.Unarchiver(e,function(){FP.storage.get("META-INF/container.xml",function(e){this.parseContainer(e)}.bind(this))}.bind(this))},FP.Book.prototype.isSaved=function(e){return localStorage.getItem("bookPath")!=this.bookPath||localStorage.getItem("fpjs-version")!=FP.VERSION||e==1?(localStorage.setItem("fpjs-version",FP.VERSION),localStorage.setItem("bookPath",this.bookPath),localStorage.setItem("stored",0),localStorage.setItem("spinePos",0),localStorage.setItem("chapterPos",0),localStorage.setItem("displayedPages",0),this.spinePos=0,this.stored=0,!1):(this.spinePos=parseInt(localStorage.getItem("spinePos"))||0,this.stored=parseInt(localStorage.getItem("stored"))||0,this.basePath=localStorage.getItem("basePath"),this.contentsPath=localStorage.getItem("contentsPath"),this.metadata=JSON.parse(localStorage.getItem("metadata")),this.assets=JSON.parse(localStorage.getItem("assets")),this.spine=JSON.parse(localStorage.getItem("spine")),this.spineIndexByURL=JSON.parse(localStorage.getItem("spineIndexByURL")),this.toc=JSON.parse(localStorage.getItem("toc")),this.prevChapterPos=parseInt(localStorage.getItem("chapterPos")),this.prevDisplayedPages=parseInt(localStorage.getItem("displayedPages")),!this.assets||!this.spine||!this.spineIndexByURL||!this.toc?(this.stored=0,!1):!0)},FP.Book.prototype.isContained=function(e){var t=/\.[0-9a-z]+$/i,n=t.exec(e);return!n||n[0]!=".epub"&&n[0]!=".zip"?!1:!0},FP.Book.prototype.onResized=function(){this.tell("book:resized",{width:this.el.clientWidth,height:this.el.clientHeight})},FP.Book.prototype.resizeIframe=function(e,t,n){var r,i;e?(r=e.msg.width,i=e.msg.height):(r=t,i=n),this.iframe.height=i,r%2!=0&&(r+=1),this.iframe.width=r},FP.Book.prototype.parseContainer=function(e){var t=this,n=e||this.bookUrl+"META-INF/container.xml";FP.core.loadXML(n,function(e){var n;rootfile=e.querySelector("rootfile"),n=rootfile.getAttribute("full-path").split("/"),n[1]?(t.basePath=t.bookUrl+n[0]+"/",t.contentsPath=t.basePath+n[1]):(t.basePath=t.bookUrl,t.contentsPath=t.bookUrl+n),t.contained&&(t.basePath=n[0]+"/"),localStorage.setItem("basePath",t.basePath),localStorage.setItem("contentsPath",t.contentsPath),t.contained?FP.storage.get(t.contentsPath,function(e){t.parseContents(e)}):t.parseContents()})},FP.Book.prototype.parseContents=function(e){var t=this,n=e||this.contentsPath;FP.core.loadXML(n,function(e){var n=e.querySelector("metadata"),r=e.querySelector("manifest"),i=e.querySelector("spine");t.parseMetadata(n),t.parseManifest(r),t.parseSpine(i),t.startDisplay()})},FP.Book.prototype.parseMetadata=function(e){var t=this,n=e.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/","title")[0];creator=e.getElementsByTagNameNS("http://purl.org/dc/elements/1.1/","creator")[0],this.metadata={},this.metadata.bookTitle=n?n.childNodes[0].nodeValue:"",this.metadata.creator=creator?creator.childNodes[0].nodeValue:"",localStorage.setItem("metadata",JSON.stringify(this.metadata)),this.tell("book:metadataReady")},FP.Book.prototype.parseManifest=function(e){var t=this;this.assets={},items=Array.prototype.slice.call(e.querySelectorAll("item")),items.forEach(function(e){var n=e.getAttribute("id"),r=e.getAttribute("href");t.assets[n]=t.basePath+r,e.getAttribute("media-type")=="application/x-dtbncx+xml"&&(t.contained?FP.storage.get(t.basePath+r,function(e){t.parseTOC(e)}):t.parseTOC(t.basePath+r))}),localStorage.setItem("assets",JSON.stringify(this.assets))},FP.Book.prototype.parseSpine=function(e){var t=this;this.spine=[],this.spineIndexByID={},this.spineIndexByURL={},items=Array.prototype.slice.call(e.getElementsByTagName("itemref")),items.forEach(function(e,n){var r=e.getAttribute("idref"),i=t.assets[r];t.spine.push({id:r,href:i}),t.spineIndexByID[r]=n,t.spineIndexByURL[i]=n}),localStorage.setItem("spine",JSON.stringify(this.spine)),localStorage.setItem("spineIndexByURL",JSON.stringify(this.spineIndexByURL)),this.tell("book:spineReady")},FP.Book.prototype.parseTOC=function(e){var t=this,n=e;this.toc=[],FP.core.loadXML(n,function(e){function s(e,t){var n=[];return items=Array.prototype.slice.call(e),items.forEach(function(e){var r=e.getAttribute("id"),i=e.querySelector("content"),o=i.getAttribute("src"),u=o.split("#"),a=e.querySelector("navLabel"),f=a.textContent?a.textContent:"",l=e.querySelectorAll("navPoint")||!1,c=!1,h=e.parentNode==t;if(!h)return;l&&(c=s(l,e)),n.push({id:r,href:o,label:f,subitems:c||!1})}),n}var n=e.querySelector("navMap"),r=e.querySelector("meta[name='cover']"),i;r&&(i=r.getAttribute("content"),t.toc.push({id:i,href:t.assets[i],label:i})),t.toc=t.toc.concat(s(n.querySelectorAll("navPoint"),n)),localStorage.setItem("toc",JSON.stringify(t.toc)),t.tell("book:tocReady")})},FP.Book.prototype.destroy=function(){window.removeEventListener("resize",this.onResized,!1)},FP.Book.prototype.getTitle=function(){return this.metadata.bookTitle},FP.Book.prototype.getCreator=function(){return this.metadata.creator},FP.Book.prototype.chapterTitle=function(){return this.spine[this.spinePos].id},FP.Book.prototype.startDisplay=function(e){var t,n=this.spinePos,r=function(e){this.prevChapterPos&&n==e.pos&&this.prevDisplayedPages==e.displayedPages&&e.page(this.prevChapterPos),this.online&&!this.contained&&this.storeOffline()}.bind(this);this.tell("book:bookReady"),this.useHash&&(t=this.route(!1,r)),(!this.useHash||!t)&&this.displayChapter(this.spinePos,r)},FP.Book.prototype.show=function(e,t){var n=e.split("#"),r=n[0],i=n[1]||!1,s=r.search("://")==-1?this.basePath+r:r,o=this.spineIndexByURL[s];r||(o=this.spinePos);if(typeof o!="number")return!1;o!=this.spinePos||!this.currentChapter?this.displayChapter(o,function(e){i&&e.section(i),t&&t(e)}):(i&&this.currentChapter.section(i),t&&t(this.currentChapter))},FP.Book.prototype.displayChapter=function(e,t){var n=this;if(e>=this.spine.length)return console.log("Reached End of Book"),!1;if(e<0)return console.log("Reached Start of Book"),!1;localStorage.setItem("spinePos",e),this.spinePos=e,this.currentChapter&&this.tell("book:chapterDestroy",this.currentChapter.getID()),this.currentChapter=new FP.Chapter(this),this.currentChapter.afterLoaded=function(e){n.tell("book:chapterReady",e.getID()),t&&t(e)}},FP.Book.prototype.nextPage=function(){var e=this.currentChapter.nextPage();e||this.nextChapter()},FP.Book.prototype.prevPage=function(){var e=this.currentChapter.prevPage();e||this.prevChapter()},FP.Book.prototype.nextChapter=function(){this.spinePos++,this.displayChapter(this.spinePos)},FP.Book.prototype.prevChapter=function(){this.spinePos--,this.displayChapter(this.spinePos,function(e){e.goToChapterEnd()})},FP.Book.prototype.getTOC=function(){return this.toc},FP.Book.prototype.storeOffline=function(e){var t=FP.core.toArray(this.assets);FP.storage.batch(t,function(){this.stored=1,localStorage.setItem("stored",1),this.tell("book:stored"),e&&e()}.bind(this))},FP.Book.prototype.availableOffline=function(){return this.stored>0?!0:!1},FP.Book.prototype.fromStorage=function(e){if(this.contained)return;e?this.availableOffline?(this.online=!1,this.tell("book:offline")):this.storeOffline(function(){this.online=!1,this.tell("book:offline")}.bind(this)):(this.online=!0,this.tell("book:online"))},FP.Book.prototype.route=function(e,t){var n=window.location.hash.replace("#/","");return this.useHash&&n.length&&n!=this.prevLocation?(this.show(n,t),this.prevLocation=n,!0):!1},FP.Book.prototype.hideHashChanges=function(){this.useHash=!1},FP.Book.prototype.getHooks=function(){var e=this;plugTypes=FP.core.toArray(this.hooks),plugTypes.forEach(function(t){var n=t.ident;plugs=FP.core.toArray(FP.Hooks[n]),plugs.forEach(function(t){e.registerHook(n,t)})})},FP.Book.prototype.registerHook=function(e,t){var n=this;typeof this.hooks[e]!="undefined"?typeof t=="function"?this.hooks[e].push(t):Array.isArray(t)&&t.forEach(function(t){n.hooks[e].push(t)}):this.hooks[e]=[func]},FP.Book.prototype.triggerHooks=function(e,t,n){function s(){i--,i<=0&&t&&t()}var r,i;if(typeof this.hooks[e]=="undefined")return!1;r=this.hooks[e],i=r.length,r.forEach(function(e){e(s,n)})},FP.Chapter=function(e,t){return this.book=e,this.iframe=this.book.iframe,this.pos=t||this.book.spinePos,this.chapInfo=this.book.spine[this.pos],this.path=this.chapInfo.href,this.ID=this.chapInfo.id,this.chapterPos=1,this.leftPos=0,localStorage.setItem("chapterPos",this.chapterPos),this.book.registerHook("beforeChapterDisplay",[this.replaceLinks.bind(this),this.replaceResources.bind(this)]),this.load(),this},FP.Chapter.prototype.load=function(){var e=this.path;this.book.online&&!this.book.contained?this.setIframeSrc(e):this.loadFromStorage(e)},FP.Chapter.prototype.loadFromStorage=function(e){var t=FP.storage.get(e,this.setIframeSrc.bind(this))},FP.Chapter.prototype.setIframeSrc=function(e){var t=this;this.visible(!1),this.iframe.src=e,this.iframe.onload=function(){t.doc=t.iframe.contentDocument,t.bodyEl=t.doc.body,t.formatSpread(),t.beforeDisplay(function(){t.calcPages(),t.book.tell("book:chapterDisplayed"),t.visible(!0)}),t.afterLoaded(t),t.book.listen("book:resized",t.formatSpread,t)}},FP.Chapter.prototype.afterLoaded=function(e){},FP.Chapter.prototype.error=function(e){console.log("error",error)},FP.Chapter.prototype.formatSpread=function(){var e=2,t=800;this.colWidth&&(this.OldcolWidth=this.colWidth,this.OldspreadWidth=this.spreadWidth),this.elWidth=this.iframe.width,this.gap=this.gap||Math.ceil(this.elWidth/8),this.elWidth<t||this.book.single?(this.spread=!1,e=1,this.colWidth=Math.floor(this.elWidth/e)):(this.spread=!0,this.colWidth=Math.floor((this.elWidth-this.gap)/e)),this.spreadWidth=(this.colWidth+this.gap)*e,this.bodyEl.style.fontSize=localStorage.getItem("fontSize")||"medium",this.bodyEl.style.margin="0",this.bodyEl.style.overflow="hidden",this.bodyEl.style.width=this.elWidth,this.bodyEl.style.height=this.book.el.clientHeight+"px",this.bodyEl.style[FP.core.columnAxis]="horizontal",this.bodyEl.style[FP.core.columnGap]=this.gap+"px",this.bodyEl.style[FP.core.columnWidth]=this.colWidth+"px",this.OldcolWidth&&this.setLeft((this.chapterPos-1)*this.spreadWidth)},FP.Chapter.prototype.goToChapterEnd=function(){this.chapterEnd()},FP.Chapter.prototype.visible=function(e){if(typeof e=="undefined")return this.iframe.style.visibility;e==1?this.iframe.style.visibility="visible":e==0&&(this.iframe.style.visibility="hidden")},FP.Chapter.prototype.calcPages=function(){this.totalWidth=this.iframe.contentDocument.documentElement.scrollWidth,this.displayedPages=Math.ceil(this.totalWidth/this.spreadWidth),localStorage.setItem("displayedPages",this.displayedPages)},FP.Chapter.prototype.nextPage=function(){return this.chapterPos<this.displayedPages?(this.chapterPos++,this.leftPos+=this.spreadWidth,this.setLeft(this.leftPos),localStorage.setItem("chapterPos",this.chapterPos),this.book.tell("book:pageChanged",this.chapterPos),this.chapterPos):!1},FP.Chapter.prototype.prevPage=function(){return this.chapterPos>1?(this.chapterPos--,this.leftPos-=this.spreadWidth,this.setLeft(this.leftPos),localStorage.setItem("chapterPos",this.chapterPos),this.book.tell("book:pageChanged",this.chapterPos),this.chapterPos):!1},FP.Chapter.prototype.chapterEnd=function(){this.page(this.displayedPages)},FP.Chapter.prototype.setLeft=function(e){this.bodyEl.style.marginLeft=-e+"px"},FP.Chapter.prototype.replaceLinks=function(e){var t=this.doc.querySelectorAll("[href]"),n=Array.prototype.slice.call(t),r=this;n.forEach(function(e){var t,n=e.getAttribute("href"),i=n.search("://"),s=n[0]=="#";i!=-1?e.setAttribute("target","_blank"):e.onclick=function(){r.book.useHash?window.location.hash="#/"+n:r.book.show(n)}}),e&&e()},FP.Chapter.prototype.replaceResources=function(e){var t,n,r;if(this.book.online&&!this.book.contained||FP.storage.getStorageType()=="filesystem")return e&&e(),!1;t=this.doc.querySelectorAll("[src]"),n=Array.prototype.slice.call(t),r=n.length,n.forEach(function(t){var n=t.getAttribute("src"),i=this.book.basePath+n;FP.storage.get(i,function(n){t.setAttribute("src",n),r--,r<=0&&e&&e()})}.bind(this))},FP.Chapter.prototype.getID=function(){return this.ID},FP.Chapter.prototype.page=function(e){return e>=1&&e<=this.displayedPages?(this.chapterPos=e,this.leftPos=this.spreadWidth*(e-1),this.setLeft(this.leftPos),localStorage.setItem("chapterPos",e),!0):!1},FP.Chapter.prototype.section=function(e){var t=this.doc.getElementById(e),n,r;t&&(n=this.leftPos+t.getBoundingClientRect().left,r=Math.floor(n/this.spreadWidth)+1,this.page(r))},FP.Chapter.prototype.beforeDisplay=function(e){this.book.triggerHooks("beforeChapterDisplay",e.bind(this),this)};var FP=FP||{};FP.core={},FP.core.getEl=function(e){return document.getElementById(e)},FP.core.getEls=function(e){return document.getElementsByClassName(e)},FP.core.loadXML=function(e,t){var n=new XMLHttpRequest;n.open("GET",e,!0),n.overrideMimeType("text/xml"),n.onload=function(e){this.status==200&&t(this.responseXML)},n.send()},FP.core.loadFile=function(e,t){var n=new XMLHttpRequest;return this.succeeded=function(e){t&&t(e)},this.failed=function(e){console.log("Error:",e)},this.start=function(){var t=this;n.open("GET",e,!0),n.responseType="blob",n.onload=function(e){this.status==200&&t.succeeded(this.response)},n.onerror=function(e){t.failed(this.status)},n.send()},{start:this.start,succeeded:this.succeeded,failed:this.failed}},FP.core.crossBrowserColumnCss=function(){var e=function(e){return e.replace(/([A-Z])/g,function(e,t){return"-"+t.toLowerCase()}).replace(/^ms-/,"-ms-")};FP.core.columnAxis=Modernizr.prefixed("columnAxis")||"columnAxis",FP.core.columnGap=Modernizr.prefixed("columnGap")||"columnGap",FP.core.columnWidth=Modernizr.prefixed("columnWidth")||"columnWidth"},FP.core.toArray=function(e){var t=[];for(member in e){var n;e.hasOwnProperty(member)&&(n=e[member],n.ident=member,t.push(n))}return t},FP.core.dataURLToBlob=function(e){var t=";base64,";if(e.indexOf(t)==-1){var n=e.split(","),r=n[0].split(":")[1],i=n[1];return new Blob([i],{type:r})}var n=e.split(t),r=n[0].split(":")[1],i=window.atob(n[1]),s=i.length,o=new Uint8Array(s);for(var u=0;u<s;++u)o[u]=i.charCodeAt(u);return new Blob([o],{type:r})},FP.core.loadScript=function(e,t,n){var r,i;i=!1,r=document.createElement("script"),r.type="text/javascript",r.async=!1,r.src=e,r.onload=r.onreadystatechange=function(){!i&&(!this.readyState||this.readyState=="complete")&&(i=!0,t&&t())},n=n||document.body,n.appendChild(r)},FP.core.loadScripts=function(e,t,n){var r=e.length,i=0,s=function(){i++,r==i?t&&t():FP.core.loadScript(e[i],s,n)};FP.core.loadScript(e[i],s,n)},FP.core.addCss=function(e,t,n){var r,i;i=!1,r=document.createElement("link"),r.type="text/css",r.rel="stylesheet",r.href=e,r.onload=r.onreadystatechange=function(){!i&&(!this.readyState||this.readyState=="complete")&&(i=!0,t&&t())},n=n||document.body,n.appendChild(r)},FP.Events=function(e,t){return this.events={},t?this.el=t:this.el=document.createElement("div"),e.createEvent=this.createEvent,e.tell=this.tell,e.listen=this.listen,e.deafen=this.deafen,e.listenUntil=this.listenUntil,this},FP.Events.prototype.createEvent=function(e){var t=new CustomEvent(e);return this.events[e]=t,t},FP.Events.prototype.tell=function(e,t){var n;this.events[e]?n=this.events[e]:(console.warn("No event:",e,"defined yet, creating."),n=this.createEvent(e)),t&&(n.msg=t),this.el.dispatchEvent(n)},FP.Events.prototype.listen=function(e,t,n){if(!this.events[e]){console.warn("No event:",e,"defined yet, creating."),this.createEvent(e);return}n?this.el.addEventListener(e,t.bind(n),!1):this.el.addEventListener(e,t,!1)},FP.Events.prototype.deafen=function(e,t){this.el.removeEventListener(e,t,!1)},FP.Events.prototype.listenUntil=function(e,t,n,r){function i(){this.deafen(e,n),this.deafen(t,i)}this.listen(e,n,r),this.listen(t,i,this)},FP.Hooks=function(){"use strict";return{register:function(e){this[e]===undefined&&(this[e]={});if(typeof this[e]!="object")throw"Already registered: "+e;return this[e]}}}(),FP.Unarchiver=function(e,t){this.libPath=FP.filePath+"libs/",this.zipUrl=e,this.callback=t,this.loadLib(function(){this.getZip(this.zipUrl)}.bind(this))},FP.Unarchiver.prototype.loadLib=function(e){typeof zip!="undefined"&&e(),FP.core.loadScript(this.libPath+"zip.js",function(){zip.workerScriptsPath=this.libPath,e()}.bind(this))},FP.Unarchiver.prototype.getZip=function(e){var t=new FP.core.loadFile(e);t.succeeded=function(e){this.getEntries(e,this.toStorage.bind(this))}.bind(this),t.failed=this.failed,t.start()},FP.Unarchiver.prototype.getEntries=function(e,t){zip.createReader(new zip.BlobReader(e),function(e){e.getEntries(t)},this.failed)},FP.Unarchiver.prototype.failed=function(e){console.log("Error:",e)},FP.Unarchiver.prototype.afterSaved=function(e){this.callback()},FP.Unarchiver.prototype.toStorage=function(e){function s(){i--,i==0&&r.afterSaved()}var t=0,n=20,r=this,i=e.length;e.forEach(function(e){setTimeout(function(e){r.saveEntryFileToStorage(e,s)},t,e),t+=n}),console.log("time",t)},FP.Unarchiver.prototype.saveEntryFileToStorage=function(e,t){var n=this;e.getData(new zip.BlobWriter,function(n){FP.storage.save(e.filename,n,t)})};
\ No newline at end of file
diff --git a/dist/workers/loader_filesystem.js b/dist/workers/loader_filesystem.js
deleted file mode 100644
index df39a0e..0000000
--- a/dist/workers/loader_filesystem.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! FuturePress - v0.1.0 - 2013-03-27 */
-;
\ No newline at end of file
diff --git a/fpjs/.DS_Store b/fpjs/.DS_Store
index dca925b..0e3e789 100644
Binary files a/fpjs/.DS_Store and b/fpjs/.DS_Store differ
diff --git a/fpjs/libs/fileStorage.min.js b/fpjs/libs/fileStorage.min.js
new file mode 100644
index 0000000..c395a96
--- /dev/null
+++ b/fpjs/libs/fileStorage.min.js
@@ -0,0 +1,2 @@
+/*! fileStorage - v0.1.0 - 2013-03-28 */var fileStorage = fileStorage || {};
+fileStorage.core=fileStorage.core||{},fileStorage.core.dataURLToBlob=function(e){var t=";base64,";if(e.indexOf(t)==-1){var n=e.split(","),r=n[0].split(":")[1],i=n[1];return new Blob([i],{type:r})}var n=e.split(t),r=n[0].split(":")[1],i=window.atob(n[1]),s=i.length,o=new Uint8Array(s);for(var u=0;u<s;++u)o[u]=i.charCodeAt(u);return new Blob([o],{type:r})},fileStorage.core.loadFile=function(e,t,n){var r=new XMLHttpRequest;return this.succeeded=function(e){t&&t(e)},this.failed=function(e){console.log("Error:",e)},this.start=function(){var t=this;r.open("GET",e,!0),r.responseType="blob",r.onload=function(e){this.status==200&&t.succeeded(this.response)},r.onerror=function(e){t.failed(this.status)},r.send()},{start:this.start,succeeded:this.succeeded,failed:this.failed}},fileStorage.Queue=function(e,t){this._q=[],this._tasks={},this.idCount=0,this.concurrency=0,this.workers=[],this.available=[],typeof e=="string"&&(this.workerStr=e,this.addWorkers(t||1)),typeof e=="function"&&(this.workerFunction=e,this.addFakeWorkers(t||1))},fileStorage.Queue.prototype.addWorkers=function(e){var t=this.concurrency,n=t+e;for(var r=t;r<e;r++){var i=new Worker(this.workerStr);this.workers.push(i),this.available.push(r)}this.concurrency=e},fileStorage.Queue.prototype.addFakeWorkers=function(e){var t=this.concurrency,n=t+e;for(var r=t;r<e;r++){var i=new fileStorage.FakeWorker(this.workerFunction);this.workers.push(i),this.available.push(r)}this.concurrency=e},fileStorage.Queue.prototype.add=function(e,t,n){var r=this.idCount;return this._tasks[r]={msg:e,callback:t||function(){}},n?(this._q.unshift(r),this.running||this.run()):this._q.push(r),this.idCount++,r},fileStorage.Queue.prototype.addGroup=function(e,t){var n=this,r=e.length,i=function(){r--,r<=0&&t()};return e.forEach(function(e){n.add(e,i)}),this.running||this.run(),i},fileStorage.Queue.prototype.run=function(e){if(this.running)return;this.running=!0;while(this.available.length){var t=this.next();if(!t)break}},fileStorage.Queue.prototype.find=function(e){},fileStorage.Queue.prototype.next=function(){var e=this,t=this._q.shift(),n,r,i;return typeof t=="undefined"?(this.running=!1,!1):(n=this._tasks[t],r=this.available.pop(),i=this.workers[r],i.postMessage(n.msg),i.onmessage=function(i){var s=i.data;n.callback(s),delete e._tasks[t],e.available.push(r),e.next()},i)},fileStorage.Queue.prototype.empty=function(){this._q=[],this._tasks={}},fileStorage.FakeWorker=function(e){this.func=e},fileStorage.FakeWorker.prototype.postMessage=function(e){setTimeout(function(){this.func(e,this.onmessage)}.bind(this),1)},fileStorage.FakeWorker.prototype.onmessage=function(e){},fileStorage.FakeWorker.prototype.close=function(e){},fileStorage.storage=function(e){return this._supported={},this._storageType=!1,this._store=!1,this.determineStorageMethod(e),this},fileStorage.storage.prototype.storageMethod=function(e){console.log("storageMethod",e),!e||typeof fileStorage.store[e]=="undefined"?this._storageType="none":this._storageType=e,this._store=new fileStorage.store[this._storageType],this._store.failed=this._error},fileStorage.storage.prototype.determineStorageMethod=function(e){var t=["filesystem","indexeddb","websql","ram"],n="none";this.checkSupport();if(e&&(e=="none"||this._supported[e]))n=e;else for(var r=-1,i=t.length;++r<i;)if(this._supported[t[r]]){n=t[r];break}this.storageMethod(n)},fileStorage.storage.prototype.get=function(e,t){return this._store.get(e,t)},fileStorage.storage.prototype.batch=function(e,t){return this._store.batch(e,t)},fileStorage.storage.prototype.getURL=function(e){return this._store.getURL(e)},fileStorage.storage.prototype.save=function(e,t,n){return this._store.save(e,t,n)},fileStorage.storage.prototype._error=function(e){console.log("error",e)},fileStorage.storage.prototype.getStorageType=function(){return this._storageType},fileStorage.storage.prototype.checkSupport=function(){var e="filesystem indexeddb websql ram".split(" "),t="RequestFileSystem IndexedDB openDatabase URL".split(" ");for(var n=-1,r=e.length;++n<r;){var i=e[n],s=t[n];this._supported[i]=this.testSupport(s)}},fileStorage.storage.prototype.testSupport=function(e){prefixes=["webkit","moz","o","ms"];for(var t=-1,n=prefixes.length;++t<n;)if(window[prefixes[t]+e])return!0;return e in window},fileStorage.store=fileStorage.store||{},fileStorage.store.filesystem=function(){function o(e){if(r){e(r);return}n(s,i,function(t){r=t,e(t)},v)}function u(e){}function a(e,n){t.addGroup(e,n)}function f(n,r){if(typeof e[n]!="undefined")return e[n];l(n,function(e){var i;e?(i=d(n,e),typeof r!="undefined"&&r(i)):t.add(n,function(e){l(e,function(t){e=d(n,t),typeof r!="undefined"&&r(e)})},!0)})}function l(e,t){var n,r;o(function(n){n.root.getFile(e,{},function(e){t(e)},function(){t(!1)})})}function c(e,t){var n=new fileStorage.core.loadFile(e);n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=v,n.start()}function h(e,t,n){o(function(r){var i=e.split("/").slice(0,-1);p(r.root,i),r.root.getFile(e,{create:!0},function(e){e.createWriter(function(e){e.onwriteend=function(e){n&&n(e)},e.onerror=function(e){v(err)},e.write(t)})},v)})}function p(e,t){if(t[0]=="."||t[0]=="")t=t.slice(1);e.getDirectory(t[0],{create:!0},function(e){t.length&&p(e,t.slice(1))},v)}function d(t,n){var r;return typeof e[t]!="undefined"?e[t]:(r=n.toURL(),e[t]=r,r)}function v(e){typeof this.failed=="undefined"?console.log("Error: ",m(e)):this.failed(e)}function m(e){switch(e.code){case FileError.QUOTA_EXCEEDED_ERR:return"QUOTA_EXCEEDED_ERR";case FileError.NOT_FOUND_ERR:return"NOT_FOUND_ERR";case FileError.SECURITY_ERR:return"SECURITY_ERR";case FileError.INVALID_MODIFICATION_ERR:return"INVALID_MODIFICATION_ERR";case FileError.INVALID_STATE_ERR:return"INVALID_STATE_ERR";case FileError.TYPE_MISMATCH_ERR:return"TYPE_MISMATCH_ERR";default:return"Unknown Error:"+e.code}}var e={},t=new fileStorage.Queue((fileStorage.filePath||"")+"loader_filesystem.js",6),n=window.requestFileSystem||window.webkitRequestFileSystem,r;const i=5242880,s=TEMPORARY;return{get:f,preload:u,batch:a,getURL:d,save:h}},fileStorage.store=fileStorage.store||{},fileStorage.store.indexeddb=function(){function u(e,t){var n={data:null},r=e;p(e,function(e){d(r,e),t(n)})}function a(e){var t;if(i){e(i);return}t=indexedDB.open(o),t.onsuccess=function(n){i=t.result,i.onerror=function(e){console.log("Database error: "+e.target.errorCode)},e&&e(i)},t.onerror=function(e){},t.onupgradeneeded=function(e){var t=e.target.result,n=t.createObjectStore("files",{keyPath:"path"})}}function f(e){}function l(e,t){n.addGroup(e,t)}function c(e,r){if(typeof t[e]!="undefined"){r(t[e]);return}h(e,function(t){var i;t?(i=v(e,t),typeof r!="undefined"&&r(i)):n.add(e,function(t){i=v(e,t),typeof r!="undefined"&&r(i)},!0)})}function h(e,t){var n,r;a(function(i){r=i.transaction(["files"]).objectStore("files"),n=r.get(e),n.onerror=function(e){console.log("error:",e),t(!1)},n.onsuccess=function(r){var i=n.result.file;i?t(i):console.log("File not found",e)}})}function p(e,t){var n=new fileStorage.core.loadFile(e);n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=m,n.start()}function d(e,t){var n={path:e,file:t},r;a(function(e){var t=e.transaction(["files"],"readwrite"),i=t.objectStore("files");r=i.put(n),r.onerror=function(e){console.log("failed: "+e.target.errorCode)},r.onsuccess=function(e){}})}function v(e,n){var r;if(typeof t[e]!="undefined"){callback(t[e]);return}return r=s.createObjectURL(n),t[e]=r,r}function m(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var e={},t={},n=new fileStorage.Queue(u,6),r=window.indexedDB||window.mozIndexedDB||window.webkitIndexedDB||window.msIndexedDB,i,s=window.URL;const o="fileStorage_db";return{get:c,preload:f,batch:l,getURL:v,save:d}},fileStorage.store=fileStorage.store||{},fileStorage.store.none=function(){function r(e,t){var n={data:null},r=u(e);r?(n.data=r,t(n)):a(e,function(e){n.data=e,t(n)})}function i(e){var t=u(e);t||n.add(e)}function s(e,t){n.addGroup(e,t)}function o(e,t){var r=u(e),i;r?typeof t!="undefined"&&t(r):n.add(e,function(n){typeof t!="undefined"&&t(e)},!0)}function u(t){var n=e[t];return typeof n!="undefined"?n:!1}function a(e,t){var n=new fileStorage.core.loadFile(e);n.succeeded=function(n){f(e,n),typeof t!="undefined"&&t(n)},n.failed=l,n.start()}function f(t,n){if(e[t])return;e[t]=t}function l(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var e={},t={},n=new fileStorage.Queue(r,6);return{get:o,preload:i,batch:s}},fileStorage.store=fileStorage.store||{},fileStorage.store.ram=function(){function i(e,t){var n={data:null},r=a(e);r?(n.data=r,t(n)):f(e,function(e){n.data=e,t(n)})}function s(e){var t=a(e);t||n.add(e)}function o(e,t){n.addGroup(e,t)}function u(e,t){var r=a(e),i;r?(i=c(e,r),typeof t!="undefined"&&t(i)):n.add(e,function(n){i=c(e,n),typeof t!="undefined"&&t(i)},!0)}function a(t){var n=e[t];return typeof n!="undefined"?n:!1}function f(e,t){var n=new fileStorage.core.loadFile(e);n.succeeded=function(n){l(e,n),typeof t!="undefined"&&t(n)},n.failed=h,n.start()}function l(t,n){if(e[t])return;e[t]=n}function c(e,n){var i;return typeof t[e]!="undefined"?t[e]:(i=r.createObjectURL(n),t[e]=i,i)}function h(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var e={},t={},n=new fileStorage.Queue(i,6),r=window.URL||window.webkitURL;return{get:u,preload:s,batch:o}},fileStorage.store=fileStorage.store||{},fileStorage.store.websql=function(){function f(e,t){var n={data:null},r=e;v(e,function(e){m(r,e),t(n)})}function l(e){if(n){e(n);return}n=openDatabase(i,s,o,u);if(!n){console.error("Database error");return}n.transaction(function(t){t.executeSql("CREATE TABLE IF NOT EXISTS "+a+" (path TEXT PRIMARY KEY ASC UNIQUE, file BLOB, type TEXT)"),e&&e(n)})}function c(e){}function h(e,n){t.addGroup(e,n)}function p(n,r){if(typeof e[n]!="undefined"){r(e[n]);return}d(n,function(e){var i;e?(i=g(n,e),typeof r!="undefined"&&r(i)):t.add(n,function(e){i=g(n,e),typeof r!="undefined"&&r(i)},!0)})}function d(e,t){var n={};console.log("path",e),n.onError=function(e,n){console.log("get Error",n),t(!1)},n.onSuccess=function(e,n){var r;n.rows.length&&(r=n.rows.item(0),t(r.file))},l(function(t){t.transaction(function(t){t.executeSql("SELECT * FROM "+a+" WHERE path='"+e+"' LIMIT 1",[],n.onSuccess,n.onError)})})}function v(e,t){var n=new fileStorage.core.loadFile(e,!1,"arraybuffer");n.succeeded=function(e){typeof t!="undefined"&&t(e)},n.failed=y,n.start()}function m(e,t){var n={},r=new FileReader,i;t instanceof Blob||console.log("Not blob"),r.onload=function(r){i=r.target.result,l(function(r){r.transaction(function(r){r.executeSql("REPLACE INTO "+a+" (path, file, type) VALUES (?,?,?)",[e,i,t.type],n.onSuccess,n.onError)})})},r.onerror=function(e){console.log("err",e)},r.readAsDataURL(t),n.onError=function(e,t){console.log("failed: ",t)},n.onSuccess=function(t){console.log("saved",e)}}function g(t,n){var i,s;if(typeof e[t]!="undefined"){callback(e[t]);return}return s=fileStorage.core.dataURLToBlob(n),i=r.createObjectURL(s),e[t]=i,i}function y(e){typeof this.failed=="undefined"?console.log("Error: ",e):this.failed(e)}var e={},t=new fileStorage.Queue(f,6),n,r=window.URL||window.webkitURL;const i="fileStoragejs_db",s="1",o="cache for files",u=5242880,a="files";return{get:p,preload:c,batch:h,getURL:g,save:m}};
\ No newline at end of file
diff --git a/fpjs/libs/loader_filesystem.js b/fpjs/libs/loader_filesystem.js
new file mode 100644
index 0000000..4cabb3a
--- /dev/null
+++ b/fpjs/libs/loader_filesystem.js
@@ -0,0 +1,2 @@
+/*! fileStorage - v0.1.0 - 2013-03-28 */var fileStorage = fileStorage || {};
+var _requestFileSystem=self.requestFileSystem||self.webkitRequestFileSystem;const DBSIZE=5242880,DBTYPE=TEMPORARY;self.onmessage=function(e){var t=e.data;self.request(t,function(e){self.save(t,e,function(){self.postMessage(t)})})},self.openFs=function(e){if(self._fs){e&&e(self._fs);return}_requestFileSystem(DBTYPE,DBSIZE,function(t){self._fs=t,e&&e(t)},self.failure)},self.request=function(e,t){var n=new self.loadFile(e);n.succeeded=function(e){t&&t(e)},n.failed=function(e){self.postMessage("failed: "+e.toString())},n.start()},self.save=function(e,t,n){self.openFs(function(r){var i=e.split("/").slice(0,-1);self.createDir(r.root,i),r.root.getFile(e,{create:!0},function(r){r.createWriter(function(r){r.onwriteend=function(e){n(e)},r.onerror=function(t){self.postMessage("write error:"+self.errorHandler(err)+" path="+e)},r.write(t)})},self.failure)})},self.createDir=function(e,t){if(t[0]=="."||t[0]=="")t=t.slice(1);e.getDirectory(t[0],{create:!0},function(e){t.length&&createDir(e,t.slice(1))},self.failure)},self.failure=function(e){self.postMessage("failed: "+self.errorHandler(e))},self.errorHandler=function(e){switch(e.code){case FileError.QUOTA_EXCEEDED_ERR:return"QUOTA_EXCEEDED_ERR";case FileError.NOT_FOUND_ERR:return"NOT_FOUND_ERR";case FileError.SECURITY_ERR:return"SECURITY_ERR";case FileError.INVALID_MODIFICATION_ERR:return"INVALID_MODIFICATION_ERR";case FileError.INVALID_STATE_ERR:return"INVALID_STATE_ERR";default:return"Unknown Error"}},self.loadFile=function(e,t){var n=new XMLHttpRequest;return this.succeeded=function(e){t&&t(e)},this.failed=function(e){console.log("Error:",e)},this.start=function(){var t=this;n.open("GET",e,!0),n.responseType="blob",n.onload=function(e){this.status==200&&t.succeeded(this.response)},n.onerror=function(e){t.failed(this.status)},n.send()},{start:this.start,succeeded:this.succeeded,failed:this.failed}},self.openFs();
\ No newline at end of file
diff --git a/fpjs/render/book.js b/fpjs/render/book.js
index 3308a46..223760b 100644
--- a/fpjs/render/book.js
+++ b/fpjs/render/book.js
@@ -41,8 +41,7 @@ FP.Book = function(elem, bookPath){
 	//-- Determine storage method
 	//-- Override options: none | ram | websqldatabase | indexeddb | filesystem
 	//FP.storageOverride = "none"
-	
-	FP.storage.determineStorageMethod(FP.storageOverride);
+	FP.storage = new fileStorage.storage(FP.storageOverride);
 	
 	// BookUrl is optional, but if present start loading process
 	if(bookPath) {
diff --git a/fpjs/render/chapter.js b/fpjs/render/chapter.js
index ab05111..811ff59 100644
--- a/fpjs/render/chapter.js
+++ b/fpjs/render/chapter.js
@@ -105,10 +105,13 @@ FP.Chapter.prototype.formatSpread = function(){
 		this.spread = true; //-- Double Page
 
 		this.colWidth = Math.floor((this.elWidth - this.gap) / divisor);
+		
+		/* - Was causing jumps, doesn't seem to be needed anymore
 		//-- Must be even for firefox
 		if(this.colWidth % 2 != 0){
 			this.colWidth -= 1;
 		}
+		*/
 	}
 
 	this.spreadWidth = (this.colWidth + this.gap) * divisor;
@@ -132,9 +135,7 @@ FP.Chapter.prototype.formatSpread = function(){
 	
 	//-- Go to current page after resize
 	if(this.OldcolWidth){		
-		this.leftPos = (this.chapterPos - 1 ) * this.spreadWidth;
-		this.bodyEl.scrollLeft = this.leftPos;
-		//this.visible(true);
+		this.setLeft((this.chapterPos - 1 ) * this.spreadWidth);
 	}
 }
 
diff --git a/fpjs/render/queue.js b/fpjs/render/queue.js
deleted file mode 100644
index 0d7a473..0000000
--- a/fpjs/render/queue.js
+++ /dev/null
@@ -1,167 +0,0 @@
-FP.Queue = function(worker, concurrency){
-	this._q = [];
-	this._tasks = {};
-	this.idCount = 0;
-	this.concurrency = 0;
-
-	this.workers = [];
-	this.available = [];
-	
-	if(typeof(worker) === "string") {
-		this.workerStr = worker;
-		this.addWorkers(concurrency || 1);
-	}
-	
-	if(typeof(worker) === "function") {
-		this.workerFunction = worker;
-		this.addFakeWorkers(concurrency || 1);
-	}
-	
-}
-
-FP.Queue.prototype.addWorkers = function(concurrency){
-	var min = this.concurrency,
-		max = min + concurrency;
-		
-	//-- Stop running jobs or something?
-	
-	for(var i=min; i < concurrency; i++){
-		var worker = new Worker(this.workerStr);
-		this.workers.push(worker); //-- Add new work
-		this.available.push(i);	//-- Make available to start tasks
-	}
-	
-	this.concurrency = concurrency;
-
-}
-
-FP.Queue.prototype.addFakeWorkers = function(concurrency){
-	var min = this.concurrency,
-		max = min + concurrency;
-
-	//-- Stop running jobs or something?
-
-	for(var i=min; i < concurrency; i++){
-		var worker = new FP.FakeWorker(this.workerFunction);
-		this.workers.push(worker); //-- Add new work
-		this.available.push(i);	//-- Make available to start tasks
-	}
-	
-	this.concurrency = concurrency;
-}
-
-FP.Queue.prototype.add = function(msg, callback, priority){
-	var ID = this.idCount;
-	//-- Add to task object : maybe check for dups
-	this._tasks[ID] = {
-		"msg": msg,
-		"callback": callback || function(){}
-	}
-	
-	//-- Add id to queue
-	if(!priority){
-		this._q.push(ID);
-	}else{
-		this._q.unshift(ID);
-		if(!this.running) this.run();
-	}
-	
-	//-- Increment ID for next task
-	this.idCount++;
-	
-	
-	
-	return ID;
-}
-
-FP.Queue.prototype.addGroup = function(group, callback){
-	var that = this,
-		counter = group.length,
-		after = function(){
-			counter--;
-			if(counter <= 0) callback();
-		};
-		
-	group.forEach(function(msg){
-		that.add(msg, after);
-	});
-
-	if(!this.running) this.run();
-	
-	return after;
-}
-
-FP.Queue.prototype.run = function(id){
-	if(this.running) return;
-	this.running = true;
-
-	while(this.available.length) {
-	  var next = this.next();
-	  if(!next) break; //-- no tasks left or error
-	}
-	
-}
-
-FP.Queue.prototype.find = function(msg){
-	
-}
-
-FP.Queue.prototype.next = function(){
-	var that = this,
-		curr = this._q.shift(),
-		task, 
-		workerID, 
-		worker;
-
-	if(typeof(curr) === "undefined"){
-		//-- Nothing left on queue
-		this.running = false;
-		return false; 
-	}
-	
-	task = this._tasks[curr];
-	workerID = this.available.pop();
-	worker = this.workers[workerID];
-	
-	//-- give worker new task
-	worker.postMessage(task.msg);
-	
-	//-- listen for worker response
-	worker.onmessage = function(e){
-		var data = e.data;
-		//console.log("data", data)
-		task.callback(data);
-		delete that._tasks[curr]; //-- Remove task
-		
-		that.available.push(workerID);
-		that.next();
-	}
-	
-	return worker;
-}
-
-FP.Queue.prototype.empty = function(){
-	this._q = [];
-	this._tasks = {};
-	//-- TODO: close workers
-}
-
-//-- A super simplistic fake worker, is passed a function instead of a script
-
-FP.FakeWorker = function(func){
-	this.func = func;
-}
-
-FP.FakeWorker.prototype.postMessage = function(msg){
-	setTimeout(function(){
-		this.func(msg, this.onmessage);
-	}.bind(this), 1);
-}
-
-FP.FakeWorker.prototype.onmessage = function(e){
-
-}
-
-FP.FakeWorker.prototype.close = function(e){
-
-}
diff --git a/fpjs/render/storage.js b/fpjs/render/storage.js
deleted file mode 100644
index ec942a4..0000000
--- a/fpjs/render/storage.js
+++ /dev/null
@@ -1,112 +0,0 @@
-FP.storage = function(){
-
-	
-	var _supported = {},
-		_storageType,
-		_store;
-	
-	
-	function storageMethod(storageType){
-		console.log("storageMethod", storageType)		
-		
-		//-- Pick store type	
-		if( !storageType || typeof(FP.store[storageType]) == "undefined"){
-			_storageType = "none";	
-		}else{
-			_storageType = storageType;
-		}
-		
-		//-- Create a new store of that type
-		_store = new FP.store[_storageType];
-		
-		//-- Handle load errors
-		_store.failed = _error;
-		
-	}
-	
-	function determineStorageMethod(override) {
-		var methods = ["filesystem", "indexeddb", "websqldatabase", "ram"],
-			method = 'none';
-		
-		checkSupport();
-		
-		if(override && (override == "none" || _supported[override])){
-			method = override;
-		}else{
-			for ( var i = -1, len = methods.length; ++i < len; ){
-				if ( _supported[methods[i]] ) {
-					method = methods[i];
-					break;
-				}
-			}
-		}	
-		
-		storageMethod(method);
-	}
-	
-	function get(path, callback) {
-		return _store.get(path, callback);
-	}
-	
-	function preload(path, callback) {
-		return _store.preload(path, callback);
-	}
-	
-	function batch(group, callback) {
-		return _store.batch(group, callback);
-	}
-	
-	function getURL(path) {
-		return _store.getURL(path);
-	}
-	
-	function save(path, file, callback) {
-		return _store.save(path, file, callback);
-	}
-	
-	
-	function _error(err){
-		console.log("error", err);	
-	}
-	
-	function getStorageType(){
-		return _storageType;	
-	}
-	
-	function checkSupport() {
-		var support = "filesystem indexeddb websqldatabase ram".split(' '),
-			toTest = "RequestFileSystem IndexedDB openDatabase URL".split(' ');
-		
-		for ( var t = -1, len = support.length; ++t < len; ){
-			
-			var test = support[t],
-				method = toTest[t];
-				
-			_supported[test] = testSupport(method);
-			
-		}
-
-	}
-	
-	function testSupport(method) {
-			prefixes = ['webkit', 'moz', 'o', 'ms'];
-			
-			for ( var i = -1, len = prefixes.length; ++i < len; ){
-				if ( window[prefixes[i] + method] ) return true;
-			}
-			return method in window;	
-		
-	}
-
-	return {
-		"get" : get,
-		"preload" : preload,
-		"batch" : batch,
-		"storageMethod": storageMethod,
-		"getURL": getURL,
-		"save" : save,
-		"getStorageType" : getStorageType,
-		"determineStorageMethod": determineStorageMethod
-	}
-	
-}();
\ No newline at end of file
diff --git a/fpjs/render/storage_filesystem.js b/fpjs/render/storage_filesystem.js
deleted file mode 100644
index 9f7d093..0000000
--- a/fpjs/render/storage_filesystem.js
+++ /dev/null
@@ -1,202 +0,0 @@
-FP.store = FP.store || {};
-
-FP.store.filesystem = function() {
-	var _urls = {},
-		_queue = new FP.Queue(FP.filePath + "workers/loader_filesystem.js", 6),
-		_requestFileSystem  = window.requestFileSystem || window.webkitRequestFileSystem,
-		_fs;
-
-	const DBSIZE = 5*1024*1024;
-	const DBTYPE = TEMPORARY;
-
-
-
-	function openFs(callback){
-
-		if(_fs){
-			callback(_fs);
-			return;
-		}
-
-		_requestFileSystem(DBTYPE,  DBSIZE, function(fs){
-			_fs = fs;
-			callback(fs);
-		}, _error);
-
-	}
-
-	function preload(path) {
-		// var fromCache = check(path);
-		// 
-		// if(!fromCache){
-		// 	_queue.add(path);
-		// }
-	}
-
-	function batch(group, callback){
-		_queue.addGroup(group, callback);
-	}
-
-	//-- Fetches url
-	function get(path, callback) {
-
-		if(typeof(_urls[path]) != "undefined"){
-			return _urls[path];
-		}
-
-		check(path, function(fromCache){
-
-			var url;
-			//-- should only be checking urls? but blank on reload?
-			if(fromCache){
-				url = getURL(path, fromCache);
-				if(typeof(callback) != "undefined"){
-					callback(url);
-				}
-			}else{
-				_queue.add(path, function(url){
-					check(url, function(file){
-						url = getURL(path, file);
-						if(typeof(callback) != "undefined"){
-							callback(url);
-						}
-					});
-				}, true);
-			}
-
-		});
-
-
-	}
-
-	function check(path, callback) {
-		var request,
-			objectStore;
-
-		openFs(function(fs){
-			fs.root.getFile(path, {}, 
-			function(fileEntry) {
-				callback(fileEntry);
-			}, 
-			function(){
-				callback(false);
-			});
-		});
-
-	}
-
-	//-- should be in worker
-
-	function request(path, callback) {
-		var xhr = new FP.core.loadFile(path);
-
-		xhr.succeeded = function(file) {
-			if(typeof(callback) != "undefined"){
-				callback(file);
-			}
-		}
-
-		xhr.failed = _error;
-
-		xhr.start();
-	}
-
-	function save(path, file, callback) {
-		openFs(function(fs){
-			var base = path.split('/').slice(0,-1);
-			createDir(fs.root, base);
-
-			fs.root.getFile(path, {create: true}, 
-			function(fileEntry) {
-				
-				fileEntry.createWriter(function(fileWriter) {
-				
-				  fileWriter.onwriteend = function(e) {
-					if(callback) callback(e);
-				  };
-				
-				  fileWriter.onerror = function(e){
-					_error(err);
-				  };
-							
-				  fileWriter.write(file);
-				 
-				 });
-				  
-			}, _error );
-		});
-	}
-	
-	function createDir(rootDirEntry, folders) {
-		// Throw out './' or '/' and move on to prevent something like '/foo/.//bar'.
-		if (folders[0] == '.' || folders[0] == '') {
-			folders = folders.slice(1);
-		}
-	
-		rootDirEntry.getDirectory(folders[0], {create: true}, function(dirEntry) {
-			// Recursively add the new subfolder (if we still have another to create).
-			if (folders.length) {
-		  		createDir(dirEntry, folders.slice(1));
-			}
-		}, _error);
-	}
-	
-	//-- end worker
-
-	function getURL(path, fileEntry){
-		var url;
-
-		if(typeof(_urls[path]) != "undefined"){
-			return _urls[path];
-		}
-
-		url = fileEntry.toURL();
-
-		_urls[path] = url;
-
-		return url;
-	}
-
-	function _error(err){
-		if(typeof(this.failed) == "undefined"){
-			console.log("Error: ", errorHandler(err));
-		}else{
-			this.failed(err);
-		}
-	}
-	
-	function errorHandler(e) {
-	  switch (e.code) {
-		case FileError.QUOTA_EXCEEDED_ERR:
-		  return 'QUOTA_EXCEEDED_ERR';
-		  break;
-		case FileError.NOT_FOUND_ERR:
-		  return 'NOT_FOUND_ERR';
-		  break;
-		case FileError.SECURITY_ERR:
-		  return 'SECURITY_ERR';
-		  break;
-		case FileError.INVALID_MODIFICATION_ERR:
-		  return 'INVALID_MODIFICATION_ERR';
-		  break;
-		case FileError.INVALID_STATE_ERR:
-		  return 'INVALID_STATE_ERR';
-		  break;
-		case FileError.TYPE_MISMATCH_ERR:
-		  return 'TYPE_MISMATCH_ERR';
-		  break;
-		default:
-		  return 'Unknown Error:' + e.code ;
-		  break;
-	 }
-	}
-
-
-	return {
-		"get" : get,
-		"preload" : preload,
-		"batch" : batch,
-		"getURL" : getURL,
-		"save" : save
-	}	
-}
diff --git a/fpjs/render/storage_indexeddb.js b/fpjs/render/storage_indexeddb.js
deleted file mode 100644
index e6d753a..0000000
--- a/fpjs/render/storage_indexeddb.js
+++ /dev/null
@@ -1,204 +0,0 @@
-FP.store = FP.store || {};
-
-FP.store.indexedDB = function() {
-	var _store = {},
-		_blobs = {},
-		_queue = new FP.Queue(loader, 6),
-		_indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB,
-		_db;
-
-	const DBNAME = "fpjs_db";
-
-	//-- max of 6 concurrent requests: http://www.browserscope.org/?category=network
-	function loader(msg, postMessage){
-		var e = {"data":null},
-			path = msg;
-
-		request(msg, function(file){
-				save(path, file);
-				postMessage(e);
-		});
-
-	}
-
-	function opendb(callback){
-		var request;
-
-		if(_db){
-			callback(_db);
-			return;
-		}
-
-		request = indexedDB.open(DBNAME);
-
-
-		request.onsuccess = function(event) {
-		  _db = request.result;
-
-		  _db.onerror = function(event) {
-			console.log("Database error: " + event.target.errorCode);
-		  };
-
-
-		  if(callback) callback(_db);
-
-		};
-
-
-		request.onerror = function(event) {
-		  // Handle errors.
-		};
-
-
-		request.onupgradeneeded = function(event) {		
-		  var db = event.target.result,
-		  	  objectStore = db.createObjectStore("files", { keyPath: "path" }); //keyPath: "id", autoIncrement: true 
-
-		  //objectStore.createIndex("path", "path", { unique: true });
-
-		  //objectStore.createIndex("file", "file", { unique: false });
-
-		};
-
-
-
-	}
-
-	function preload(path) {
-		// var fromCache = check(path);
-		// 
-		// if(!fromCache){
-		// 	_queue.add(path);
-		// }
-	}
-
-	function batch(group, callback){
-		_queue.addGroup(group, callback);
-	}
-
-	//-- Fetches url
-	function get(path, callback) {
-
-		if(typeof(_blobs[path]) != "undefined"){
-			callback(_blobs[path]);
-			return; 
-		}
-
-		check(path, function(fromCache){
-
-			var url;
-
-			if(fromCache){
-				url = getURL(path, fromCache);
-				if(typeof(callback) != "undefined"){
-					callback(url);
-				}
-			}else{
-				_queue.add(path, function(file){
-					url = getURL(path, file);
-					if(typeof(callback) != "undefined"){
-						callback(url);
-					}
-				}, true);
-			}
-
-		});
-
-
-	}
-
-	function check(path, callback) {
-		var request,
-			objectStore;
-
-		opendb(function(db){
-			objectStore = db.transaction(["files"]).objectStore("files");
-			request = objectStore.get(path);
-
-			request.onerror = function(event) {
-			  callback(false);
-			};
-
-			request.onsuccess = function(event) {
-			  callback(request.result.file);
-			};
-		});
-
-	}
-
-	//-- should be in worker
-
-	function request(path, callback) {
-		var xhr = new FP.core.loadFile(path);
-
-		xhr.succeeded = function(file) {
-			if(typeof(callback) != "undefined"){
-				callback(file);
-			}
-		}
-
-		xhr.failed = _error;
-
-		xhr.start();
-	}
-
-	function save(path, file) {
-		var	entry = {"path" : path, "file": file},
-			request;
-
-		opendb(function(db){
-			var transaction = db.transaction(["files"], "readwrite");
-			var store = transaction.objectStore("files");	
-			request = store.put(entry);
-
-			request.onerror = function(event) {
-			  console.log("failed: " + event.target.errorCode);
-			};
-
-			request.onsuccess = function(event) {
-			  //-- Do nothing for now
-			  console.log("saved", path);
-			};
-		});
-	}
-
-	//-- end worker
-
-	function getURL(path, file){
-		var url;
-
-		if(typeof(_blobs[path]) != "undefined"){
-			callback(_blobs[path]);
-			return; 
-		}
-
-		url = this._URL.createObjectURL(file);
-
-		//-- need to revokeObjectURL previous urls, but only when cleaning cache
-		// this.createdURLs.forEach(function(url){
-		// 	this._URL.revokeObjectURL(url);
-		// });
-
-		_blobs[path] = url;
-
-		return url;
-	}
-
-	function _error(err){
-		if(typeof(this.failed) == "undefined"){
-			console.log("Error: ", err);
-		}else{
-			this.failed(err);
-		}
-	}
-
-
-
-	return {
-		"get" : get,
-		"preload" : preload,
-		"batch" : batch,
-		"getURL" : getURL,
-		"save" : save
-	}	
-}
diff --git a/fpjs/render/storage_none.js b/fpjs/render/storage_none.js
deleted file mode 100644
index 9399d92..0000000
--- a/fpjs/render/storage_none.js
+++ /dev/null
@@ -1,103 +0,0 @@
-FP.store = FP.store || {};
-
-FP.store.none = function() {
-	var _store = {},
-		_blobs = {},
-		_queue = new FP.Queue(loader, 6); 
-		//-- max of 6 concurrent requests: http://www.browserscope.org/?category=network
-
-
-	function loader(msg, callback){
-		var e = {"data":null},
-			fromCache = check(msg);
-
-		if(fromCache){
-			e.data = fromCache;
-			callback(e);
-		}else{
-			request(msg, function(url){
-				e.data = url;
-				callback(e);
-			});
-		}
-	}
-
-	function preload(path) {
-		var fromCache = check(path);
-
-		if(!fromCache){
-			_queue.add(path);
-		}
-	}
-
-	function batch(group, callback){
-		_queue.addGroup(group, callback);
-	}
-
-	//-- Fetches url
-	function get(path, callback) {
-		var fromCache = check(path),
-			url;
-
-		if(fromCache){
-			if(typeof(callback) != "undefined"){
-				callback(fromCache);
-			}
-		}else{
-			_queue.add(path, function(file){
-				url = getURL(path, file);
-				if(typeof(callback) != "undefined"){
-					callback(url);
-				}
-			}, true);
-		}
-
-	}
-
-	function check(path) {
-		var url = _store[path];
-
-		if(typeof(url) != "undefined"){
-			return url;
-		}
-
-		return false;
-	}
-
-	function request(path, callback) {
-		var xhr = new FP.core.loadFile(path);
-
-		xhr.succeeded = function(file) {
-			//console.log("file", file)
-			cache(path, file);
-			if(typeof(callback) != "undefined"){
-				callback(file);
-			}
-		}
-
-		xhr.failed = _error;
-
-		xhr.start();
-	}
-
-	function cache(path, file) {
-		if(_store[path]) return;
-
-		_store[path] = path;
-	}
-
-
-	function _error(err){
-		if(typeof(this.failed) == "undefined"){
-			console.log("Error: ", err);
-		}else{
-			this.failed(err);
-		}
-	}
-
-	return {
-		"get" : get,
-		"preload" : preload,
-		"batch" : batch
-	}	
-}
\ No newline at end of file
diff --git a/fpjs/render/storage_ram.js b/fpjs/render/storage_ram.js
deleted file mode 100644
index 71e06fd..0000000
--- a/fpjs/render/storage_ram.js
+++ /dev/null
@@ -1,131 +0,0 @@
-FP.store = FP.store || {};
-
-FP.store.ram = function() {
-	var _store = {},
-		_blobs = {},
-		_queue = new FP.Queue(loader, 6),
-		_URL = window.URL; 
-		//-- max of 6 concurrent requests: http://www.browserscope.org/?category=network
-
-	
-	function loader(msg, callback){
-		var e = {"data":null},
-			fromCache = check(msg);
-
-		if(fromCache){
-			e.data = fromCache;
-			callback(e);
-		}else{
-			request(msg, function(file){
-				e.data = file;
-				callback(e);
-			});
-		}
-	}
-
-	function preload(path) {
-		var fromCache = check(path);
-
-		if(!fromCache){
-			_queue.add(path);
-		}
-	}
-
-	function batch(group, callback){
-		_queue.addGroup(group, callback);
-	}
-
-	//-- Fetches url
-	function get(path, callback) {
-		var fromCache = check(path),
-			url;
-
-		if(fromCache){
-			url = getURL(path, fromCache);
-			if(typeof(callback) != "undefined"){
-				callback(url);
-			}
-		}else{
-			_queue.add(path, function(file){
-				url = getURL(path, file);
-				if(typeof(callback) != "undefined"){
-					callback(url);
-				}
-			}, true);
-		}
-
-	}
-
-	function check(path) {
-		var file = _store[path];
-
-		if(typeof(file) != "undefined"){
-			return file;
-		}
-
-		return false;
-	}
-
-	function request(path, callback) {
-		var xhr = new FP.core.loadFile(path);
-
-		xhr.succeeded = function(file) {
-			//console.log("file", file)
-			cache(path, file);
-			if(typeof(callback) != "undefined"){
-				callback(file);
-			}
-		}
-
-		xhr.failed = _error;
-
-		xhr.start();
-	}
-
-	function cache(path, file) {
-		if(_store[path]) return;
-
-		_store[path] = file;
-	}
-
-	function getURL(path, file){
-		var url;
-
-		if(typeof(_blobs[path]) != "undefined"){
-			return _blobs[path];
-		}
-
-		url = _URL.createObjectURL(file);
-
-		//-- need to revokeObjectURL previous urls, but only when cleaning cache
-		// this.createdURLs.forEach(function(url){
-		// 	this._URL.revokeObjectURL(url);
-		// });
-
-		_blobs[path] = url;
-
-		return url;
-	}
-
-	// this.succeeded = function(){
-	// 	console.log("loaded");	
-	// }
-	// 
-	// this.failed = function(){
-	// 	console.log("loaded");	
-	// }
-
-	function _error(err){
-		if(typeof(this.failed) == "undefined"){
-			console.log("Error: ", err);
-		}else{
-			this.failed(err);
-		}
-	}
-
-	return {
-		"get" : get,
-		"preload" : preload,
-		"batch" : batch
-	}	
-}
\ No newline at end of file
diff --git a/fpjs/render/storage_websql.js b/fpjs/render/storage_websql.js
deleted file mode 100644
index 66b69d4..0000000
--- a/fpjs/render/storage_websql.js
+++ /dev/null
@@ -1,209 +0,0 @@
-FP.store = FP.store || {};
-
-FP.store.websql = function() {
-	var _blobs = {},
-		_queue = new FP.Queue(loader, 6),
-		_db,
-		_URL = window.URL;
-
-	const DBNAME = "fpjs_db";
-	const DBVERSION = "1";
-	const DBDESC = "cache for files";
-	const DBSIZE =  5 * 1024 * 1024;
-	const TABLENAME = "files";
-	
-	function loader(msg, postMessage){
-		var e = {"data":null},
-			path = msg;
-
-		request(msg, function(file){
-				save(path, file);
-				postMessage(e);
-		});
-
-	}
-
-	function opendb(callback){
-
-		if(_db){
-			callback(_db);
-			return;
-		}
-		
-		_db = openDatabase(DBNAME, DBVERSION, DBDESC, DBSIZE);
-		
-		if(!_db){
-			console.error("Database error");
-			return;
-		}
-		
-		_db.transaction(function (tx) {
-		  tx.executeSql('CREATE TABLE IF NOT EXISTS '+ TABLENAME +' (path TEXT PRIMARY KEY ASC UNIQUE, file BLOB, type TEXT)');
-		  if(callback) callback(_db);
-		});
-
-	}
-
-	function preload(path) {
-		// var fromCache = check(path);
-		// 
-		// if(!fromCache){
-		// 	_queue.add(path);
-		// }
-	}
-
-	function batch(group, callback){
-		_queue.addGroup(group, callback);
-	}
-
-	//-- Fetches url
-	function get(path, callback) {
-
-		if(typeof(_blobs[path]) != "undefined"){
-			callback(_blobs[path]);
-			return; 
-		}
-
-		check(path, function(fromCache){
-
-			var url;
-
-			if(fromCache){
-				url = getURL(path, fromCache);
-				if(typeof(callback) != "undefined"){
-					callback(url);
-				}
-			}else{
-				_queue.add(path, function(file){
-					url = getURL(path, file);
-					if(typeof(callback) != "undefined"){
-						callback(url);
-					}
-				}, true);
-			}
-
-		});
-
-
-	}
-
-	function check(path, callback) {
-		var	request = {};
-		
-		request.onError = function(event, err) {
-		  console.log("get Error", err);
-
-		  callback(false);
-		};
-		
-		request.onSuccess = function(transaction, result) {
-			var row;
-
-			if(result.rows.length){
-				row = result.rows.item(0);
-				callback(row.file);
-			}
-			
-		};
-		
-		opendb(function(db){
-			
-			db.transaction(function(tx){
-				tx.executeSql("SELECT * FROM "+TABLENAME+" WHERE path='"+path+"' LIMIT 1",
-					[],
-					request.onSuccess,
-					request.onError);
-			});
-
-		});
-
-	}
-
-	function request(path, callback) {
-		var xhr = new FP.core.loadFile(path);
-
-		xhr.succeeded = function(file) {
-			if(typeof(callback) != "undefined"){
-				callback(file);
-			}
-		}
-
-		xhr.failed = _error;
-
-		xhr.start();
-	}
-
-	function save(path, file) {
-		var	request = {},
-			reader = new FileReader(),
-			fileString;
-		
-		reader.readAsDataURL(file);
-			
-		reader.onload = function(event){
-			fileString = event.target.result;
-			opendb(function(db){
-				
-				db.transaction(function(tx){
-					tx.executeSql("REPLACE INTO "+TABLENAME+" (path, file, type) VALUES (?,?,?)",
-						[path, fileString, file.type],
-						request.onSuccess,
-						request.onError);
-				});
-							
-			});
-		}
-		
-		request.onError = function(event, err) {
-		  console.log("failed: ", err);
-		};
-		
-		request.onSuccess = function(event) {
-		  //-- Do nothing for now
-		  //console.log("saved", path);
-		};
-
-
-		
-		
-	}
-
-	function getURL(path, file){
-		var url, blob;
-
-		if(typeof(_blobs[path]) != "undefined"){
-			callback(_blobs[path]);
-			return; 
-		}
-		
-		blob = FP.core.dataURLToBlob(file); //go from data url to blob
-		url = _URL.createObjectURL(blob);
-
-		//-- need to revokeObjectURL previous urls, but only when cleaning cache
-		// this.createdURLs.forEach(function(url){
-		// 	this._URL.revokeObjectURL(url);
-		// });
-
-		_blobs[path] = url;
-
-		return url;
-	}
-
-	function _error(err){
-		if(typeof(this.failed) == "undefined"){
-			console.log("Error: ", err);
-		}else{
-			this.failed(err);
-		}
-	}
-
-
-
-	return {
-		"get" : get,
-		"preload" : preload,
-		"batch" : batch,
-		"getURL" : getURL,
-		"save" : save
-	}	
-}
diff --git a/fpjs/workers/loader_filesystem.js b/fpjs/workers/loader_filesystem.js
deleted file mode 100644
index 2d0299b..0000000
--- a/fpjs/workers/loader_filesystem.js
+++ /dev/null
@@ -1,156 +0,0 @@
-var _requestFileSystem  = self.requestFileSystem || self.webkitRequestFileSystem;
-
-const DBSIZE = 5*1024*1024;
-const DBTYPE = TEMPORARY;
-
-
-
-self.onmessage = function(event){ 
-	var path = event.data; 
-	
-	
-	self.request(path, function(file){
-		self.save(path, file, function(){
-			self.postMessage(path);
-		});
-	});
-
-};
-
-self.openFs = function(callback){
-	
-	if(self._fs){
-		if(callback) callback(self._fs);
-		return;
-	}
-	
-	_requestFileSystem(DBTYPE,  DBSIZE, function(fs){
-		self._fs = fs;
-		if(callback) callback(fs);
-	}, self.failure);
-
-}
-
-self.request = function(path, callback) {
-	var xhr = new self.loadFile(path);
-
-	xhr.succeeded = function(file) {
-		if(callback) callback(file);
-	}
-
-	xhr.failed = function(err){
-		self.postMessage("failed: " +err.toString());
-	};
-
-	xhr.start();
-}
-
-self.save = function(path, file, callback) {
-	self.openFs(function(fs){
-		var base = path.split('/').slice(0,-1);
-		self.createDir(fs.root, base);
-				
-		fs.root.getFile(path, {create: true}, 
-		function(fileEntry) {
-			
-			fileEntry.createWriter(function(fileWriter) {
-			
-			  fileWriter.onwriteend = function(e) {
-				callback(e);
-			  };
-			
-			  fileWriter.onerror = function(e){
-				self.postMessage("write error:" + self.errorHandler(err) + " path="+path);
-			  };
-						
-			  fileWriter.write(file);
-			 
-			 });
-			  
-		}, self.failure );
-	});
-}
-
-self.createDir = function(rootDirEntry, folders) {
-	// Throw out './' or '/' and move on to prevent something like '/foo/.//bar'.
-	if (folders[0] == '.' || folders[0] == '') {
-		folders = folders.slice(1);
-	}
-	
-	rootDirEntry.getDirectory(folders[0], {create: true}, function(dirEntry) {
-		// Recursively add the new subfolder (if we still have another to create).
-		if (folders.length) {
-	  		createDir(dirEntry, folders.slice(1));
-		}
-	}, self.failure);
-};
-
-self.failure = function(err){
-	self.postMessage("failed: " + self.errorHandler(err));
-}
-
-self.errorHandler = function(e) {
-  switch (e.code) {
-	case FileError.QUOTA_EXCEEDED_ERR:
-	  return 'QUOTA_EXCEEDED_ERR';
-	  break;
-	case FileError.NOT_FOUND_ERR:
-	  return 'NOT_FOUND_ERR';
-	  break;
-	case FileError.SECURITY_ERR:
-	  return 'SECURITY_ERR';
-	  break;
-	case FileError.INVALID_MODIFICATION_ERR:
-	  return 'INVALID_MODIFICATION_ERR';
-	  break;
-	case FileError.INVALID_STATE_ERR:
-	  return 'INVALID_STATE_ERR';
-	  break;
-	default:
-	  return 'Unknown Error';
-	  break;
- }
-}
-
-self.loadFile = function(url, callback){
-	var xhr = new XMLHttpRequest();
-
-	this.succeeded = function(response){
-		if(callback){
-			callback(response);
-		}
-	}
-
-	this.failed = function(err){
-		console.log("Error:", err);
-	}
-
-	this.start = function(){
-		var that = this;
-
-		xhr.open('GET', url, true);
-		xhr.responseType = 'blob';
-
-		xhr.onload = function(e) {
-			if (this.status == 200) {
-				that.succeeded(this.response);
-			}
-		};
-
-		xhr.onerror = function(e) {
-			that.failed(this.status); //-- TODO: better error message
-		};
-
-		xhr.send();
-	}
-
-	return {
-		"start": this.start,
-		"succeeded" : this.succeeded,
-		"failed" : this.failed
-	}
-}
-  
-self.openFs();
-
-
diff --git a/fpjs/workers/loader_indexeddb.js b/fpjs/workers/loader_indexeddb.js
deleted file mode 100644
index aa975b3..0000000
--- a/fpjs/workers/loader_indexeddb.js
+++ /dev/null
@@ -1,94 +0,0 @@
-importScripts('core.js');
-
-const DBNAME = "fpjs_db";
-var indexedDB = self.indexedDB || self.mozIndexedDB || self.webkitIndexedDB || self.msIndexedDB;
-
-var _q = [];
-
-self.onmessage = function(event){ 
-	var path = event.data; 
-	
-	if(self._objectStore){
-		self.request(path, function(file){
-			self.save(path, file);
-			self.postMessage("succeeded");
-		});
-	}
-	
-
-};
-
-self.opendb = function(callback){
-	
-	var request = indexedDB.open(DBNAME);
-	
-	request.onsuccess = function(event) {
-	  self._db = request.result;
-	  
-	  _db.onerror = function(event) {
-		self.postMessage("failed: " + event.target.errorCode);
-	  };
-	  
-	  self._transaction = _db.transaction(["files"], "readwrite");//.objectStore("files");
-
-	  self._objectStore = self._transaction.objectStore("files");
-	  
-	  if(callback) callback(_db);
-	  
-	};
-	
-	
-	request.onerror = function(event) {
-	  self.postMessage("failed: " + event.target.errorCode);
-	};
-	
-
-}
-
-self.request = function(path, callback) {
-	var xhr = new FP.core.loadFile(path);
-
-	xhr.succeeded = function(file) {
-		if(callback) callback(file);
-	}
-
-	xhr.failed = function(err){
-		self.postMessage("failed: " +err);
-	};
-
-	xhr.start();
-}
-
-self.save = function(path, file) {
-	var	entry = {"path" : path, "file": file},
-		request;
-	self.postMessage("failed: before");
-	var transaction = _db.transaction(["files"], "readwrite");
-	var store = transaction.objectStore("files");	
-	request = store.put(entry);
-	self.postMessage("failed: after");
-	request.onerror = function(event) {
-	  self.postMessage("failed: " + event.target.errorCode);
-	};
-	
-	request.onsuccess = function(event) {
-	  //-- Do nothing for now
-	};
-}
-
-self.opendb();
-/*
-self.opendb(function(db){
-	var transaction = db.transaction(["files"], "readwrite")//.objectStore("files");
-	
-	transaction.oncomplete = function(event) {
-	  self.postMessage("All done!");
-	};
-	
-	transaction.onerror = function(event) {
-	  self.postMessage("Error in Transaction")
-	};
-	
-	_objectStore = transaction.objectStore("files");
-});
-*/
diff --git a/grunt.js b/grunt.js
index 24a0642..d4e3d1b 100644
--- a/grunt.js
+++ b/grunt.js
@@ -9,13 +9,15 @@ module.exports = function(grunt) {
 	  },
 	  min: {
 		'dist/render.min.js': ['<banner>', 'fpjs/render/*.js'],
-		'dist/workers/loader_filesystem.js': ['<banner>', 'fpjs/render/workers/loader_filesystem.js'],
+		//'dist/workers/loader_filesystem.js': ['<banner>', 'fpjs/render/workers/loader_filesystem.js'],
 		'dist/reader.min.js': ['<banner>', 'fpjs/reader/*.js'],
 		'dist/hooks/hooks.min.js': ['<banner>', 'fpjs/hooks/*.js'],
 		'dist/libs/zip.js': ['fpjs/libs/zip.js'],
 		'dist/libs/deflate.js': ['fpjs/libs/deflate.js'],
 		'dist/libs/inflate.js': ['fpjs/libs/inflate.js'],
-		'dist/libs/mime-types.js': ['fpjs/libs/mime-types.js']
+		'dist/libs/mime-types.js': ['fpjs/libs/mime-types.js'],
+		'dist/libs/fileStorage.min.js': ['fpjs/libs/fileStorage.min.js'],
+		'dist/libs/loader_filesystem.js': ['fpjs/libs/loader_filesystem.js']
 	  }
 	});
 	
diff --git a/index.html b/index.html
index 3d73960..f4c705b 100755
--- a/index.html
+++ b/index.html
@@ -19,6 +19,8 @@
             document.onreadystatechange = function () {  
               if (document.readyState == "complete") {
                 FP.filePath = "/dist/";
+                fileStorage.filePath = FP.filePath + "libs/";
+
                 FPR.app.init();
               }  
             };
@@ -34,6 +36,9 @@
         <!-- Reader -->
         <script src="dist/reader.min.js"></script>
         
+        <!-- fileStorage -->
+        <script src="dist/libs/fileStorage.min.js"></script>
+        
     </head>
     <body>
         <div id="sidebar">