From c065d55ea85ec6f946b5dc574eb25c1f25c3431c Mon Sep 17 00:00:00 2001
From: kelson42 <kelson@kiwix.org>
Date: Mon, 2 Dec 2013 23:02:02 +0100
Subject: [PATCH] + new tabs system feature

---
 res/drawable-hdpi/action_delete.png           |  Bin 0 -> 1624 bytes
 res/drawable-mdpi/action_delete.png           |  Bin 0 -> 1359 bytes
 res/drawable-xhdpi/action_delete.png          |  Bin 0 -> 1848 bytes
 res/layout/main.xml                           |  162 +--
 res/layout/viewpager.xml                      |    6 +
 res/values-af/strings.xml                     |   16 +-
 res/values-ar/strings.xml                     |   16 +-
 res/values-as/strings.xml                     |   16 +-
 res/values-ba/strings.xml                     |   16 +-
 res/values-be/strings.xml                     |   16 +-
 res/values-bg/strings.xml                     |   16 +-
 res/values-bm/strings.xml                     |   16 +-
 res/values-bn/strings.xml                     |   16 +-
 res/values-br/strings.xml                     |   16 +-
 res/values-ca/strings.xml                     |   16 +-
 res/values-cs/strings.xml                     |   16 +-
 res/values-cv/strings.xml                     |   16 +-
 res/values-cy/strings.xml                     |   16 +-
 res/values-da/strings.xml                     |   16 +-
 res/values-de/strings.xml                     |   16 +-
 res/values-el/strings.xml                     |   16 +-
 res/values-eo/strings.xml                     |   16 +-
 res/values-es/strings.xml                     |   16 +-
 res/values-et/strings.xml                     |   16 +-
 res/values-fa/strings.xml                     |   16 +-
 res/values-fi/strings.xml                     |   16 +-
 res/values-fo/strings.xml                     |   16 +-
 res/values-fr/strings.xml                     |   16 +-
 res/values-gl/strings.xml                     |   16 +-
 res/values-gu/strings.xml                     |   16 +-
 res/values-he/strings.xml                     |   16 +-
 res/values-hi/strings.xml                     |   16 +-
 res/values-hr/strings.xml                     |   16 +-
 res/values-hu/strings.xml                     |   16 +-
 res/values-ia/strings.xml                     |   16 +-
 res/values-id/strings.xml                     |   16 +-
 res/values-ie/strings.xml                     |   16 +-
 res/values-it/strings.xml                     |   16 +-
 res/values-ja/strings.xml                     |   16 +-
 res/values-jv/strings.xml                     |   16 +-
 res/values-ka/strings.xml                     |   16 +-
 res/values-km/strings.xml                     |   16 +-
 res/values-kn/strings.xml                     |   16 +-
 res/values-ko/strings.xml                     |   16 +-
 res/values-ky/strings.xml                     |   16 +-
 res/values-lb/strings.xml                     |   16 +-
 res/values-li/strings.xml                     |   16 +-
 res/values-lt/strings.xml                     |   16 +-
 res/values-lv/strings.xml                     |   16 +-
 res/values-mk/strings.xml                     |   16 +-
 res/values-ml/strings.xml                     |   16 +-
 res/values-mn/strings.xml                     |   16 +-
 res/values-ms/strings.xml                     |   16 +-
 res/values-mt/strings.xml                     |   16 +-
 res/values-my/strings.xml                     |   16 +-
 res/values-nb/strings.xml                     |   16 +-
 res/values-ne/strings.xml                     |   16 +-
 res/values-nl/strings.xml                     |   16 +-
 res/values-nn/strings.xml                     |   16 +-
 res/values-oc/strings.xml                     |   16 +-
 res/values-or/strings.xml                     |   16 +-
 res/values-pl/strings.xml                     |   16 +-
 res/values-ps/strings.xml                     |   16 +-
 res/values-pt/strings.xml                     |   16 +-
 res/values-qu/strings.xml                     |   16 +-
 res/values-rm/strings.xml                     |   16 +-
 res/values-ro/strings.xml                     |   16 +-
 res/values-ru/strings.xml                     |   16 +-
 res/values-sa/strings.xml                     |   16 +-
 res/values-sh/strings.xml                     |   16 +-
 res/values-si/strings.xml                     |   16 +-
 res/values-sk/strings.xml                     |   16 +-
 res/values-sl/strings.xml                     |   16 +-
 res/values-sq/strings.xml                     |   16 +-
 res/values-su/strings.xml                     |   16 +-
 res/values-sv/strings.xml                     |   16 +-
 res/values-sw/strings.xml                     |   16 +-
 res/values-ta/strings.xml                     |   16 +-
 res/values-te/strings.xml                     |   16 +-
 res/values-th/strings.xml                     |   16 +-
 res/values-tl/strings.xml                     |   16 +-
 res/values-tr/strings.xml                     |   16 +-
 res/values-uk/strings.xml                     |   16 +-
 res/values-ur/strings.xml                     |   16 +-
 res/values-uz/strings.xml                     |   16 +-
 res/values-vi/strings.xml                     |   16 +-
 res/values-yi/strings.xml                     |   16 +-
 res/values-yo/strings.xml                     |   16 +-
 res/values-zh/strings.xml                     |   16 +-
 res/values/ids.xml                            |    4 +
 res/xml/preferences.xml                       |   72 +-
 .../kiwixmobile/KiwixMobileActivity.java      | 1209 +++++++----------
 .../kiwixmobile/KiwixMobileFragment.java      |  913 +++++++++++++
 src/org/kiwix/kiwixmobile/KiwixWebView.java   |   55 +-
 .../kiwixmobile/ZimFileSelectActivity.java    |    7 +-
 95 files changed, 2403 insertions(+), 1369 deletions(-)
 create mode 100644 res/drawable-hdpi/action_delete.png
 create mode 100644 res/drawable-mdpi/action_delete.png
 create mode 100644 res/drawable-xhdpi/action_delete.png
 create mode 100644 res/layout/viewpager.xml
 create mode 100644 res/values/ids.xml
 create mode 100644 src/org/kiwix/kiwixmobile/KiwixMobileFragment.java

diff --git a/res/drawable-hdpi/action_delete.png b/res/drawable-hdpi/action_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9ce89e0460b368de996f6b1d7ee149ae5fb1315
GIT binary patch
literal 1624
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip$=JZnz{SMW$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19ytk=TD+111qr(RHE$SnZc?2=lPS(cjOR+OKs0QR(1
zCT_PF;WQ7bHwCL(!2U4CsaGH97=2LGB1JV!2$+6AOnAZta^OinH4m8Hi+~B+%vbIe
z0|V13PZ!6Kid%1H?#{d7Akt=gFXxa}LsLURu0o7zi^jA`<_i`+W?Zm*$s@~*%NH+R
zXvlc6{oy5tLrPp7J3JkH%r++T{}<eUF=1`^$2S!`hm>ohGWQnO{QGEW{Jdi7HLD-f
z+p}1=Fhw!`pV?5iKfX+p<@rIo34TA$YW)aEOEHiL`ILU_VbUB%^8@Q9y`J^Gn(bXv
zuDCg`ESCj0pLF-4;}-W>pZ|E7vZIDc(%!zfHJLN8PF=B-GiJU(Trc;9k_zTMvc<I-
z9cTWzF;-fX9bhzwuCV&uyJ6DrJX75S!8r`aU)=E&XmozS*UHjb<1zEe_5<o|x2-?0
z)qGJ+;EZ{??sBrzDK7Opkxq5?n*P%)?4RrrtYDRExL(S=gR}4RvfCvOzVF<0Si--j
zvg=`)qzvQs*J2x_bF6$^e9ba<e=By_cHA;~>)a5QEt0<lHt>Y)$g(v$y<Adi1=F*w
zlIKo7&%PD&ZQ>FCgT?QxCiS=<bbRMx`_3+_=WR>hvNQAb?{wZXE^IeT%-r3ZrgJKc
zyVK&hg_vM<uYvIK{g;1sq&viDnD3d#y!^$T34WPYTV35(_wdbMW+t|zj8Xic>4!<|
z7sK0JLlV^|7eqgB)M$NBJD({@ZSk5rnd_3m76!a7sPl4~Et?_5c)#NCrsf=V?u2uJ
zTW)3;itq67iswChBGuC;T6sQ`nT)xbX0F+-ATy&J)-}eBu~(eCwq2{`@{m<uvyIm?
zn$b}B{8ix-Ip-Op83TDeWqyh*$U5Qv)S6wXT~XxcxyC)6<*EuBZ6ywCmhoO^Dv@>)
zD~{#lSYCLj%tQV*@4p)6@Y0fu<fG-@nvWG{u!kRzdu(#n%PTuoC+gl0@1GweY_gmh
z=FItiK)68h$Jco!6LXWU7hKX271}oclU&HX_I(W5z9wIvMJQMHTl??kcI!whiRs!V
s@5XOi%e3`>&^BP&THD}u+@Fz+;rN|9?#>?y0zqZHr>mdKI;Vst0H|?TumAu6

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/action_delete.png b/res/drawable-mdpi/action_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..cedb1085b85cf28fec0152168da61defb93fd6fa
GIT binary patch
literal 1359
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip$->3i)zr|`$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OnfUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dPPdr2
z;WQ7bHwCv_3~=hz2RcR{6tzfE4HE*U9}p9saDg0n(of9;ruQOX!d}0Wsg!|%@t~)R
zV@SoVH`6zIF*^#hy?=C6g-guwsFP#h8kgDHTg9ZM<&U^+5L)9>BXHj#C&z`mTO&zx
zT9ae*f(6sxsFwfZ-v2N{FC{-;wN>(m#iln#|IeK}mvhIWZ?0q1LCFogtQCLNe(YP%
z=i4ayK<lw@!SVd-SzDv*7&W)?njKWHKdmFjnEXKEPIRwB*VF^t7EHQaGuW#|K0UWo
zaK6u$nB>#Yce2gqtnB)xR0HN`4y-a-l?twJ8cGA$`yVt0o>EPi&ZH#tDLU}k$&Few
z*s>G4nfyL+MJx%P_$Xj2-$b)hTX*(9n3O1+e&R7pR^E<I%lHSk+8Tlj*rpxOnXzPs
zQ2Ed5f4Ww=4e1|P>~c6XKJCfxTz9hNZ&+UUN8KCg4=bPQ&9;3uO;UDdhwy^~Z4DE2
zHavK7t*grZ`7S1<d4(sKmPE(9^v|BOQ^;$%<FQqd4`yxSW%O&Cn;y4VS>c&zvGKR=
zFt4=+eGLWz3OQwmFFfFIn$5(-%-HD5c*vn)gKokC%MZsM1-(%|@>Hfjd(B?X{D|A;
zKVE1A*UTx9+30>ksOG5YHI@_Z$1HawOkcgpd77|)(ae(fyKEOoZ+cjNxL*H(djlf_
XdqiO|XOH7mP!Z?p>gTe~DWM4f=>_8H

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/action_delete.png b/res/drawable-xhdpi/action_delete.png
new file mode 100644
index 0000000000000000000000000000000000000000..98c73da1f35b06932d1a76de6468afb2768998d4
GIT binary patch
literal 1848
zcmaJ?X;c$e7!430Q7Iq-qE?2WC|fcU6CsfZSpWkB5h8|CDMK<qgk<7mFhK!Ri6U-A
z#a2WVj-ax*p;b{UNZl$3)UD!z2o$yAidsD!wG$NVkJ343=Dqiw@7`~_?@WGFWT?%k
z38P3Pl8tzdD4JM<OfSWX_*N+wcMyvU9xTIS&}3W(V+e__K$8$atb$XJXarVdF8&P(
zAdxJlD5Wx7CW+w6Q579F`Ox($4S^<+0s{3KSe}O9KoXLoRP$)hPS(=^rGiIWz?Og#
zjSxvy&RL2fF-s$*@}+5Vj)E3A8wk*I2?7;@!+>6uuGVt(JlY^Hm)M)k3>q-#f~WCl
zpOTVEq5vU^Apn~W`pUtX5HOQPhgcwo#qj}{AOtcXCIj^Ig+MObj|)P;=Z8i_!xYKf
zXi>=LSj34(OT}>wm%-5KbadSeI*O$*AP$Ga0GSLX)0gn@)n=-3SnsRWx(_jk5Um_j
zYH%g0226}_5}JYYXhf!;N>FKrY1P`#Z6X@R(8C%AL<dbJ4LM3A|L>|&4SQ?xXyi-2
z|4FQsW@->dG@?Z_FgY=}WOq|24OfUEFpgqU6ipxMVpJ-MquNwd0|;Z-bO?~Za;4g2
z8AM1VT(Me<!)iGq7V&5V2VJRDa9M&GU<fDz*#b}mLBSA*1#yB|0wF(y4f(MI&=6LH
z$}?1m8Xv+czF?sdu_iI7G(=<(f+?3EiVzG{0fR+zl_TaN3?7m1GgdKTF2axzu?!*^
zhH13_8ugHg(2r?5EL`F+EPX^x=p7@3{V1cgoVYJlVi8}ezttBnNps+j-*LCxLs=EO
zud6J_?RuAZ3XQU&lmEjS>*XsyHh$;Ub!M~mxm@dIcH_wQ&GUlo*REN8ZQG4iS*pV>
z_uN_wGQ^uD%vnW>luoy}+7ewyO7Ht^McnP$AA5Rhjeg;VsSRTjsRzkZ>MBB?ltxV#
zWvX^)FoU=q$Z~rniC%NAOHW<Bx6QJVv%>Yo`+B2q<F*&xfFPcBXGM+E8M71YuX-qs
zjk!u7aYMn>!ZQ8gyq8#jryz%x6=XaQ^$RL98W$GWC0O1zdK;VcYRPD`TIxzaYBjIp
z-JIhr6<m<l!-;XUa&O5x_{8iE-2-$6BDmqR#bnB?zz7*I>Ffilz+%aAqsIDKM!e^y
z8ZKO<nV2Iq{(A522k#{R>tPLUH=m9zOfYPk-8N=x(9zbKusxh`|F!iSv-er-q#ls=
zP`xO22?HLm4rtEg6{g#C&N?dGeZ<x~%>{FHNZ4?jnh@HoPJA>|UK_vR^y7jpd3}dM
zzdsUIJgM}ZSM0%2=I7()o$wfw<5;&WEM}b!@cv_3<&|FYGyDDaE$*jN%v)M6OmpSO
zxmflnGWR;|bcl@rg36ECQs+`rD0}RkEM1muywk(CvYnp|BPDG<3+9O|o4V&3ZTC8@
z4>O)MbeJ={i}PL{*0<b0W+C(3XYd@=`oX%DJ^kC@`eOZ#y;8mRetxlROn&<*zU+?M
z<@rU67=qaI<&Hr58?Waj&mBD<Th-QGvU~l@=>8(U)$}WmyN$cvzAqA!FZxJ&-X-<-
zj~k~c(_2Qixs(Rhc~2QgwVb3}IR9wnCW99xbxHf1Fk8>+qq#0piF;6U1hpf((0qDT
z-4<!ZJ+G^>63;_vU8NZvM>==gce;mb*_S_T%l9aF=-9Be<8HzQk@=+wP4{c3HUycE
zb+zKH_imW6(Xi<}D67qHBj0)=MOTB;)azT{8ypJc<qoe{cAZ6kkr%FyY`X~FBy}a2
zMQ>P4zDDxvZT|^d=d%i*DhP2BPM(<Ft(E<m9aB>3e|qe(Q^`q83+L?mTpxFbvQVS*
z+Z{+rJlsMFUzku0KOD%vWL7<Ug2TY;zo{t2Ic~r!d@>eYqcwIsIV<yOYX7KP>m`dj
z5H}E2SR7$!zIxB%B;|r^z(0KZ)4sgsNjcqR<ULju!H3)<x8&HJt~`?YHQD&}uH(PI
z-u!dxOJ<F>-P4&?YE_X5+*pt_*;U*3(dO2ow!!NnGxsseSA8UpCnefGaLNVRzcKyG
N#KDoG{er|5{{R}rz~}$~

literal 0
HcmV?d00001

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 5ca46b495..b1f061faf 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -3,84 +3,90 @@
               android:id="@+id/MainLayout"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
-              android:orientation="vertical" >
-  
-  <LinearLayout
-      android:id="@+id/articleSearchBar"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      android:visibility="gone"
-      android:layout_marginTop="10dp"
-      android:layout_marginBottom="10dp"
-      android:layout_marginLeft="10dp"
-      android:layout_marginRight="10dp"
-      >
-    
-    <AutoCompleteTextView
-	android:id="@+id/articleSearchTextView"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:completionThreshold="1"
-	android:ellipsize="end"
-	android:ems="10"
-	android:hint="@string/articlesearch_hint"
-	android:imeOptions="actionGo"
-	android:inputType="text|textCapWords"
-	android:maxLines="1"
-	android:background="@android:color/background_dark"
-	android:textColor="@android:color/primary_text_dark"
-	/>
-    
-  </LinearLayout>
-  
-  <RelativeLayout
-      android:id="@+id/FullscreenButtonLayout"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent">
-    
+              android:orientation="vertical">
+
+    <LinearLayout
+            android:id="@+id/articleSearchBar"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp">
+
+        <AutoCompleteTextView
+                android:id="@+id/articleSearchTextView"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:completionThreshold="1"
+                android:ellipsize="end"
+                android:ems="10"
+                android:hint="@string/articlesearch_hint"
+                android:imeOptions="actionGo"
+                android:inputType="text|textCapWords"
+                android:maxLines="1"
+                android:background="@android:color/background_dark"
+                android:textColor="@android:color/primary_text_dark"/>
+
+    </LinearLayout>
+
     <RelativeLayout
-	android:id="@+id/ElementsLayout"
-	android:layout_height="fill_parent"
-	android:layout_width="fill_parent"
-	android:orientation="vertical"
-	>
-      
-      <org.kiwix.kiwixmobile.KiwixWebView
-	  android:id="@+id/webview"
-	  android:layout_width="fill_parent"
-	  android:layout_height="fill_parent">
-	<requestFocus />
-      </org.kiwix.kiwixmobile.KiwixWebView>
-      
-      <ImageButton
-	  android:id="@+id/FullscreenControlButton"
-	  android:layout_width="55px"
-	  android:layout_height="55px"
-	  android:layout_margin="7px"
-	  android:hint="@string/menu_exitfullscreen"
-	  android:background="#DDFFFFFF"
-	  android:src="@drawable/fullscreen_exit"
-	  android:layout_alignParentRight="true"
-	  android:visibility="invisible"
-	  />
-      
-      <Button
-	  android:id="@+id/button_backtotop"
-	  android:layout_width="fill_parent"                    
-	  android:layout_height="wrap_content"
-	  android:text="@string/button_backtotop"
-	  android:alpha="0.6"
-	  android:textColor="@android:color/black"
-	  android:textStyle="bold"
-	  android:background="#DDFFFFFF"
-	  android:layout_centerHorizontal="true"
-	  android:layout_alignParentBottom="true"
-	  android:visibility="invisible"
-	  />
-      
+            android:id="@+id/FullscreenButtonLayout"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+        <RelativeLayout
+                android:id="@+id/ElementsLayout"
+                android:layout_height="fill_parent"
+                android:layout_width="fill_parent"
+                android:orientation="vertical">
+
+            <org.kiwix.kiwixmobile.KiwixWebView
+                    android:id="@+id/webview"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent">
+
+                <requestFocus/>
+
+            </org.kiwix.kiwixmobile.KiwixWebView>
+
+            <LinearLayout
+                    android:id="@+id/remove_tab"
+                    android:orientation="vertical"
+                    android:layout_width="150dp"
+                    android:layout_height="150dp"
+                    android:layout_centerInParent="true"
+                    android:background="@drawable/navigation_cancel"
+                    android:visibility="invisible"/>
+
+            <ImageButton
+                    android:id="@+id/FullscreenControlButton"
+                    android:layout_width="55px"
+                    android:layout_height="55px"
+                    android:layout_margin="7px"
+                    android:hint="@string/menu_exitfullscreen"
+                    android:background="#DDFFFFFF"
+                    android:src="@drawable/fullscreen_exit"
+                    android:layout_alignParentRight="true"
+                    android:visibility="invisible"/>
+
+            <Button
+                    android:id="@+id/button_backtotop"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.6"
+                    android:gravity="center"
+                    android:textColor="@android:color/black"
+                    android:textStyle="bold"
+                    android:background="#DDFFFFFF"
+                    android:layout_centerHorizontal="true"
+                    android:layout_alignParentBottom="true"
+                    android:visibility="invisible"/>
+
+        </RelativeLayout>
+
     </RelativeLayout>
-    
-  </RelativeLayout>
-  
+
 </LinearLayout>
diff --git a/res/layout/viewpager.xml b/res/layout/viewpager.xml
new file mode 100644
index 000000000..661194bd5
--- /dev/null
+++ b/res/layout/viewpager.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+                                   android:id="@+id/viewPager"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="match_parent"/>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7d7d887ad..aacbee9b2 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Wys</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 7ef16781a..4b6c35081 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">عرض</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index caa24ccdd..7a005f948 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">প্রদর্শন</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ba/strings.xml b/res/values-ba/strings.xml
index f26714c14..7aa0f3b59 100644
--- a/res/values-ba/strings.xml
+++ b/res/values-ba/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Күрһәтергә</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d3eca2a6c..9c7c36e10 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Паказаць</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 36db5fe04..282d13c8e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Показване</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-bm/strings.xml b/res/values-bm/strings.xml
index 1e0428255..529d401a9 100644
--- a/res/values-bm/strings.xml
+++ b/res/values-bm/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Jirayɔrɔ</string>
     <string name="pref_zoom_title">Bonya/dɔgɔya hakɛ</string>
     <string name="pref_zoom_dialogtitle">Bonya/dɔgɔya hakɛ</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index eec579178..c7290c195 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">প্রদর্শন</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-br/strings.xml b/res/values-br/strings.xml
index 7a82f6961..86f6b8093 100644
--- a/res/values-br/strings.xml
+++ b/res/values-br/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Diskwel</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Titouroù</string>
     <string name="pref_info_version">Stumm</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 933e5df50..3e128f7b2 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Visualitza</string>
     <string name="pref_zoom_title">Nivell de zoom</string>
     <string name="pref_zoom_dialogtitle">Nivell de zoom</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Informació</string>
     <string name="pref_info_version">Versió</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Mostra un botó al final de la pàgina per desplaçar-se cap a la part superior</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index e94e13360..86da84aba 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Zobrazení</string>
     <string name="pref_zoom_title">Úroveň zvětšení</string>
     <string name="pref_zoom_dialogtitle">Úroveň zvětšení</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Informace</string>
     <string name="pref_info_version">Verze</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-cv/strings.xml b/res/values-cv/strings.xml
index fa16813ea..35919b042 100644
--- a/res/values-cv/strings.xml
+++ b/res/values-cv/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Кăтарт</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index 1ccc1a778..f8633e269 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Golwg</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index f5110eb70..908f332ee 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Vis</string>
     <string name="pref_zoom_title">Zoom-niveau</string>
     <string name="pref_zoom_dialogtitle">Zoom-niveau</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Få vist en knap i slutningen af siden for at rulle op til toppen</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3aaf4b9cc..82b3355ad 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Bildschirm</string>
     <string name="pref_zoom_title">Vergrößerungsstufe</string>
     <string name="pref_zoom_dialogtitle">Vergrößerungsstufe</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Zeigt einen Button am Seitenende an, um zum Anfang hochzuscrollen.</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a15419ef2..ab903898c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Εμφάνιση</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Πληροφορίες</string>
     <string name="pref_info_version">Έκδοση</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index bc2ad4e99..31ec6dddc 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Montri</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f1cc141e9..3a5180523 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Mostrar</string>
     <string name="pref_zoom_title">Nivel de zoom</string>
     <string name="pref_zoom_dialogtitle">Nivel de zoom</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Información</string>
     <string name="pref_info_version">Versión</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Mostrar un botón al final de la página para desplazarse al comienzo</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 5dcb8276d..b69509af3 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Vaade</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index a5c546dc7..9d015b615 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">نمایش</string>
     <string name="pref_zoom_title">سطح بزرگ/کوچک‌نمایی</string>
     <string name="pref_zoom_dialogtitle">سطح بزرگ/کوچک‌نمایی</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">اطلاعات</string>
     <string name="pref_info_version">نسخه</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">نمایش دکمه در پایان صفحه برای انتقال به بالا</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ce94619e8..0d538e78c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Näytä</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-fo/strings.xml b/res/values-fo/strings.xml
index bd52e983d..e7472ce8b 100644
--- a/res/values-fo/strings.xml
+++ b/res/values-fo/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Vís</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 81f24a160..f08360adf 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Affichage</string>
     <string name="pref_zoom_title">Niveau de zoom</string>
     <string name="pref_zoom_dialogtitle">Niveau de zoom</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Afficher un bouton en bas de la page pour revenir au début</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index d11df147e..702577579 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Visualización</string>
     <string name="pref_zoom_title">Nivel de zoom</string>
     <string name="pref_zoom_dialogtitle">Nivel de zoom</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Información</string>
     <string name="pref_info_version">Versión</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Mostrar un botón ao final da páxina para volver ao inicio da mesma</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index d25bc10fe..3ee52bff7 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">દર્શાવો</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index fe1bbf76f..3982d0580 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">תצוגה</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 0fb22af25..d15b4edfc 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">डिस्प्ले</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 42ac03e85..1ba2cfc78 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Prikaz</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index dc564f9d6..ad0d23aaa 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Megjelenítés</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ia/strings.xml b/res/values-ia/strings.xml
index 10d0b9a64..639223897 100644
--- a/res/values-ia/strings.xml
+++ b/res/values-ia/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Visualisation</string>
     <string name="pref_zoom_title">Nivello de zoom</string>
     <string name="pref_zoom_dialogtitle">Nivello de zoom</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 6f18e06d4..ba284fe51 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Tampilan</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ie/strings.xml b/res/values-ie/strings.xml
index aca1bb156..57a691b60 100644
--- a/res/values-ie/strings.xml
+++ b/res/values-ie/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Exposition</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 78d541710..8a97a580a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Visualizza</string>
     <string name="pref_zoom_title">Livello di zoom</string>
     <string name="pref_zoom_dialogtitle">Livello di zoom</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Informazioni</string>
     <string name="pref_info_version">Versione</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Mostra un pulsante alla fine della pagina per scorrere fino all\'inizio</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 42cb40f69..b8f020ec0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">表示</string>
     <string name="pref_zoom_title">ズーム レベル</string>
     <string name="pref_zoom_dialogtitle">ズーム レベル</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">情報</string>
     <string name="pref_info_version">バージョン</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-jv/strings.xml b/res/values-jv/strings.xml
index 69437b781..56a25ecc8 100644
--- a/res/values-jv/strings.xml
+++ b/res/values-jv/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Pajangan</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 793231da9..c47241568 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">ჩვენება</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 326597711..3555951c8 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">បង្ហាញ</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 74f060824..faab413e7 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">ಪ್ರದರ್ಶಿಸು</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 32c5e6a76..deb816d43 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">표시</string>
     <string name="pref_zoom_title">확대/축소 수준</string>
     <string name="pref_zoom_dialogtitle">확대/축소 수준</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">정보</string>
     <string name="pref_info_version">버전</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 40fd32053..6bfb65e22 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Көрсөтүү</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 519f703c8..9e0d58e0e 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Weisen</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-li/strings.xml b/res/values-li/strings.xml
index 957c2a5bb..5cbe76f41 100644
--- a/res/values-li/strings.xml
+++ b/res/values-li/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Bild</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 89f44849f..9fe17e8aa 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Rodyti</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1b8beaf2d..64e71fdac 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Displejs</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4395fcdc1..96b31607e 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Приказ</string>
     <string name="pref_zoom_title">Ниво на приближеност</string>
     <string name="pref_zoom_dialogtitle">Ниво на приближеност</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Информации</string>
     <string name="pref_info_version">Верзија</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Прикажувај копче за враќање најгоре на крајот од страницата</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index b02aa4884..93f4c303c 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">കാഴ്ച</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index c55186c3d..4113f37f9 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Үзүүлэх</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7f16c60d9..a3b78e043 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Paparan</string>
     <string name="pref_zoom_title">Takat zum</string>
     <string name="pref_zoom_dialogtitle">Takat zum</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-mt/strings.xml b/res/values-mt/strings.xml
index 839f5b3cb..fc013955d 100644
--- a/res/values-mt/strings.xml
+++ b/res/values-mt/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Viżwal</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 51959fd19..4d54503d6 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">မြင်ကွင်း</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 20db9a63a..8d212935a 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Skjerm</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 074a6f4ea..5cc54bac1 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">दृश्य</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 59ca50d56..394e0f777 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Beeld</string>
     <string name="pref_zoom_title">Zoomniveau</string>
     <string name="pref_zoom_dialogtitle">Zoomniveau</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Informatie</string>
     <string name="pref_info_version">Versie</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Aan het einde van de pagina een knop weergeven om terug te gaan naar boven</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Zoeken naar ZIM-bestanden. Even geduld...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-nn/strings.xml b/res/values-nn/strings.xml
index b83caf71e..5c02846ba 100644
--- a/res/values-nn/strings.xml
+++ b/res/values-nn/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Skjerm</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-oc/strings.xml b/res/values-oc/strings.xml
index 9e0c5cdf3..995e41210 100644
--- a/res/values-oc/strings.xml
+++ b/res/values-oc/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Afichar</string>
     <string name="pref_zoom_title">Nivèl de zoom</string>
     <string name="pref_zoom_dialogtitle">Nivèl de zoom</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 10a097646..4dfc34853 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">ଦେଖଣା</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ca582dcda..663bea51f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Widok</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Wersja</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ps/strings.xml b/res/values-ps/strings.xml
index e441dce42..b70b4d913 100644
--- a/res/values-ps/strings.xml
+++ b/res/values-ps/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">ښکارېدنه</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 11f362f1b..d22dc34e5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Ver</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-qu/strings.xml b/res/values-qu/strings.xml
index 826477004..76e66afdf 100644
--- a/res/values-qu/strings.xml
+++ b/res/values-qu/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Qhawachiy</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 34173f88e..69ea969c8 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Vista</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7398a3779..8c8952f20 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Afișare</string>
     <string name="pref_zoom_title">Nivel de zoom</string>
     <string name="pref_zoom_dialogtitle">Nivel de zoom</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 13d732bda..e092e1329 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Показать</string>
     <string name="pref_zoom_title">Уровень масштабирования</string>
     <string name="pref_zoom_dialogtitle">Уровень масштабирования</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Информация</string>
     <string name="pref_info_version">Версия</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Отобразить кнопку в конце страницы для прокрутки вверх</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-sa/strings.xml b/res/values-sa/strings.xml
index fcf3dbfcc..cba073505 100644
--- a/res/values-sa/strings.xml
+++ b/res/values-sa/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">प्रकाश</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-sh/strings.xml b/res/values-sh/strings.xml
index 4b53ded88..37ba30b15 100644
--- a/res/values-sh/strings.xml
+++ b/res/values-sh/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Prikaži</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index df3ab5bb5..12208131b 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">පෙන්වීම</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ecf87cd65..968a22f80 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Zobrazenie</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2dc5087ac..c468d38b2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Prikaz</string>
     <string name="pref_zoom_title">Raven zumiranja</string>
     <string name="pref_zoom_dialogtitle">Raven zumiranja</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 324b688ae..7d4c9616a 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Shfaq</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-su/strings.xml b/res/values-su/strings.xml
index 35aec6941..90fad4283 100644
--- a/res/values-su/strings.xml
+++ b/res/values-su/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Panémbong</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 821bb62f5..3e444b4c0 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Visa</string>
     <string name="pref_zoom_title">Zoomnivå</string>
     <string name="pref_zoom_dialogtitle">Zoomnivå</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Visar en knapp i slutet på sidan för att rulla upp till toppen</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 691acb70d..1c09dd91b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Onesha</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index bf759a7e4..8df1f78bf 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">காண்பி</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 52e084bb6..ae367af23 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">దర్శనం</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 13f72121d..30e2c86db 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">แสดงผล</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3fe24a6f1..94af92041 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Palitawin</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b4eaa3ebd..77ca86036 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Göster</string>
     <string name="pref_zoom_title">Zum seviyesi</string>
     <string name="pref_zoom_dialogtitle">Zum seviyesi</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Bilgi</string>
     <string name="pref_info_version">Sürüm</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Başa dönmek için sayfanın altında bir düğme görüntüler</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f62f17096..52be9cb0e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Показати</string>
     <string name="pref_zoom_title">Рівень масштабування</string>
     <string name="pref_zoom_dialogtitle">Рівень масштабування</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Інформація</string>
     <string name="pref_info_version">Версія</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Відображати кнопки в кінці сторінки для прокрутки вгору</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 200c13435..1a8d4e30f 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">تظاہرہ</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index a1064bcad..8c85af8dc 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Koʻrsatish</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index df1b92a9e..7202eb72b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Hiển thị</string>
     <string name="pref_zoom_title">Mức thu phóng</string>
     <string name="pref_zoom_dialogtitle">Mức thu phóng</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Thông tin</string>
     <string name="pref_info_version">Phiên bản</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Hiển thị nút ở cuối trang để di chuyển lên trên cùng</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-yi/strings.xml b/res/values-yi/strings.xml
index ed9bc6641..8b55b2804 100644
--- a/res/values-yi/strings.xml
+++ b/res/values-yi/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">אויסשטעלונג</string>
     <string name="pref_zoom_title">פארגרעסערונג ניווא</string>
     <string name="pref_zoom_dialogtitle">פארגרעסערונג ניווא</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-yo/strings.xml b/res/values-yo/strings.xml
index b3273e0e3..90dd5241b 100644
--- a/res/values-yo/strings.xml
+++ b/res/values-yo/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">Ìmúhàn</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
index bbcf4375f..70168d6ed 100644
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -28,12 +28,11 @@
     <string name="pref_display_title">显示</string>
     <string name="pref_zoom_title">Zoom level</string>
     <string name="pref_zoom_dialogtitle">Zoom level</string>
-    <string-array
-	name="pref_zoom_entries">
-	<item>Automatic</item>
-	<item>Small</item>
-	<item>Medium</item>
-	<item>Large</item>
+    <string-array name="pref_zoom_entries">
+        <item>Automatic</item>
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
     </string-array>
     <string name="pref_info_title">Information</string>
     <string name="pref_info_version">Version</string>
@@ -45,4 +44,9 @@
     <string name="pref_backtotop_summary">Display a button at the end of the page to scroll up to the top</string>
     <string name="rescan_fs">Rescan SD card</string>
     <string name="rescan_fs_warning">Scanning for ZIM files, please wait...</string>
+    <string name="remove_tab">Remove Tab</string>
+    <string name="add_tab">Add new Tab</string>
+    <string name="remove">Remove</string>
+    <string name="open_in_new_tab">Open link in new Tab?</string>
+    <string name="share_via">Share via</string>
 </resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
new file mode 100644
index 000000000..3b0a9d984
--- /dev/null
+++ b/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="action_bar_tab_id" type="id">ActionBarTab</item>
+</resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 36d47a6e2..357cae2f4 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,33 +1,45 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-  <PreferenceCategory 
-      android:key="pref_display"
-      android:title="@string/pref_display_title">
-    
-    <ListPreference
-	android:key="pref_zoom"
-	android:title="@string/pref_zoom_title"
-	android:dialogTitle="@string/pref_zoom_dialogtitle"
-	android:entries="@array/pref_zoom_entries"
-	android:entryValues="@array/pref_zoom_entryvalues"
-	android:defaultValue="automatic" />
-    <CheckBoxPreference android:key="pref_zoom_enabled" android:title="@string/pref_zoom_enable" android:summary="@string/pref_zoom_enable_summary" android:defaultValue="false"/>
-    <CheckBoxPreference android:key="pref_nightmode" android:title="@string/pref_nightmode" android:defaultValue="false" android:summary="@string/pref_nightmode_summary"/>
-    <CheckBoxPreference android:key="pref_backtotop" android:title="@string/pref_backtotop" android:summary="@string/pref_backtotop_summary" android:defaultValue="true"/>
+    <PreferenceCategory
+            android:key="pref_display"
+            android:title="@string/pref_display_title">
+
+        <ListPreference
+                android:key="pref_zoom"
+                android:title="@string/pref_zoom_title"
+                android:dialogTitle="@string/pref_zoom_dialogtitle"
+                android:entries="@array/pref_zoom_entries"
+                android:entryValues="@array/pref_zoom_entryvalues"
+                android:defaultValue="automatic"/>
+        <CheckBoxPreference
+                android:key="pref_zoom_enabled"
+                android:title="@string/pref_zoom_enable"
+                android:summary="@string/pref_zoom_enable_summary"
+                android:defaultValue="false"/>
+        <CheckBoxPreference
+                android:key="pref_nightmode"
+                android:title="@string/pref_nightmode"
+                android:defaultValue="false"
+                android:summary="@string/pref_nightmode_summary"/>
+        <CheckBoxPreference
+                android:key="pref_backtotop"
+                android:title="@string/pref_backtotop"
+                android:summary="@string/pref_backtotop_summary"
+                android:defaultValue="true"/>
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+            android:title="@string/pref_info_title"
+            android:key="pref_info">
+
+        <EditTextPreference
+                android:key="pref_version"
+                android:title="@string/pref_info_version"
+                android:enabled="false"
+                android:selectable="false"
+                android:persistent="false"
+                android:shouldDisableView="false"/>
+
+    </PreferenceCategory>
 
-  </PreferenceCategory>
-  
-  <PreferenceCategory 
-      android:title="@string/pref_info_title"
-      android:key="pref_info">
-    
-    <EditTextPreference
-	android:key="pref_version"
-	android:title="@string/pref_info_version"
-	android:enabled="false" 
-	android:selectable="false"
-	android:persistent="false"
-	android:shouldDisableView="false"/>
-    
-  </PreferenceCategory>
-  
 </PreferenceScreen>
diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
index 3e3cd0216..36d1431ee 100644
--- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
+++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
@@ -1,831 +1,574 @@
 package org.kiwix.kiwixmobile;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
-import android.content.Context;
+import android.app.ActionBar;
+import android.app.FragmentTransaction;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.text.InputType;
-import android.text.Editable;
-import android.text.TextWatcher;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.view.ViewPager;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.SparseArray;
+import android.view.DragEvent;
 import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.MeasureSpec;
-import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.Window;
 import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.Filter;
-import android.widget.Filterable;
-import android.widget.ImageButton;
+import android.widget.HorizontalScrollView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
-import android.widget.Toast;
-import android.view.View.OnClickListener;
-import android.view.animation.AnimationUtils;
+import android.widget.Spinner;
 
-public class KiwixMobileActivity extends Activity {
-    /** Called when the activity is first created. */
+public class KiwixMobileActivity extends FragmentActivity implements ActionBar.TabListener,
+        View.OnLongClickListener, View.OnDragListener, KiwixMobileFragment.FragmentCommunicator {
 
-	private SharedPreferences mySharedPreferences;
-	private KiwixWebView webView;
-	private ArrayAdapter<String> adapter;
-	protected boolean requestClearHistoryAfterLoad;
-	protected boolean requestInitAllMenuItems;
-	protected boolean NightMode;
-	protected int requestWebReloadOnFinished;
-	private static final int ZIMFILESELECT_REQUEST_CODE = 1234;
-	private static final int PREFERENCES_REQUEST_CODE = 1235;
-	private static final String PREFS_KIWIX_MOBILE = "kiwix-mobile";
-	private AutoCompleteTextView articleSearchtextView;
-	private LinearLayout articleSearchBar;
-	private Menu menu;
-	//Tracks the user preference of of showing the button or not
-	private boolean isButtonEnabled = true;
-	private boolean isFullscreenOpened;
-	private ImageButton exitFullscreenButton;
+    private int NUM_ITEMS = 0;
 
+    private ViewPagerAdapter mViewPagerAdapter;
 
-	public class AutoCompleteAdapter extends ArrayAdapter<String> implements Filterable {
-		private ArrayList<String> mData;
+    private ViewPager mViewPager;
 
-		public AutoCompleteAdapter(Context context, int textViewResourceId) {
-			super(context, textViewResourceId);
-			mData = new ArrayList<String>();
-		}
+    private ActionBar mActionBar;
 
-		@Override
-		public int getCount() {
-			return mData.size();
-		}
+    private KiwixMobileFragment mCurrentFragment;
 
-		@Override
-		public String getItem(int index) {
-			return mData.get(index);
-		}
+    private int mCurrentDraggedTab;
 
-		@Override
-		public Filter getFilter() {
-			Filter myFilter = new Filter() {
-				@Override
-				protected FilterResults performFiltering(CharSequence constraint) {
-					FilterResults filterResults = new FilterResults();
-					ArrayList<String> data = new ArrayList<String>();
-					if(constraint != null) {
-						// A class that queries a web API, parses the data and returns an ArrayList<Style>
-						try {
-							String prefix = constraint.toString();
+    private int mTabsWidth;
 
-							ZimContentProvider.searchSuggestions(prefix, 200);
-							String suggestion;
+    private int mTabsHeight;
 
-							data.clear();
-							while ((suggestion = ZimContentProvider.getNextSuggestion())!=null) {
-								data.add(suggestion);
-							}
-						}
-						catch(Exception e) {}
-						// Now assign the values and count to the FilterResults object
-						filterResults.values = data;
-						filterResults.count = data.size();
-					}
-					return filterResults;
-				}
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-				@SuppressWarnings("unchecked")
-				@Override
-				protected void publishResults(CharSequence contraint, FilterResults results) {
-					if(results != null && results.count > 0) {
-						notifyDataSetChanged();
-						mData = (ArrayList<String>)results.values;
-					}
-					else {
-						notifyDataSetInvalidated();
-					}
-				}
-			};
-			return myFilter;
-		}
-	}
-    @SuppressLint("SetJavaScriptEnabled")
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
+        requestWindowFeature(Window.FEATURE_PROGRESS);
+        setProgressBarVisibility(true);
 
-	super.onCreate(savedInstanceState);
-	requestClearHistoryAfterLoad=false;
-	requestWebReloadOnFinished = 0;
-	requestInitAllMenuItems = false;
-	NightMode = false;
-	isFullscreenOpened = false;
+        setContentView(R.layout.viewpager);
 
+        // Set an OnDragListener on the entire View. Now we can track, if the user drags the
+        // Tab outside the View
+        getWindow().getDecorView().setOnDragListener(this);
 
-	this.requestWindowFeature(Window.FEATURE_PROGRESS);
-	this.setProgressBarVisibility(true);
+        mViewPagerAdapter = new ViewPagerAdapter(getSupportFragmentManager());
 
-	setContentView(R.layout.main);
-	//Locate and hook up the Back to top button
-	findViewById(R.id.button_backtotop).setOnClickListener(new View.OnClickListener() {
-	    @Override
-	    public void onClick(View view) {
-		webView.pageUp(true);
-	    }
-	});
-	webView =(KiwixWebView) findViewById(R.id.webview);
-	articleSearchBar = (LinearLayout) findViewById(R.id.articleSearchBar);
-	articleSearchtextView = (AutoCompleteTextView) findViewById(R.id.articleSearchTextView);
+        mActionBar = getActionBar();
 
-	exitFullscreenButton=(ImageButton)findViewById(R.id.FullscreenControlButton);
-	exitFullscreenButton.setOnClickListener(new OnClickListener() {
-	    @Override
-	    public void onClick(View v) {
-		closeFullScreen();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            mActionBar.setHomeButtonEnabled(false);
+        }
 
+        mViewPager = (ViewPager) findViewById(R.id.viewPager);
+        mViewPager.setAdapter(mViewPagerAdapter);
+        // set the amount of pages, that the ViewPager adapter should keep in cache
+        mViewPager.setOffscreenPageLimit(3);
+        // margin between every ViewPager Fragment
+        mViewPager.setPageMargin(3);
+        mViewPager.setOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                reattachOnLongClickListener();
+                super.onPageScrolled(position, positionOffset, positionOffsetPixels);
+            }
 
-	    }
-	});
+            @Override
+            public void onPageScrollStateChanged(int state) {
+                reattachOnLongClickListener();
+                super.onPageScrollStateChanged(state);
+            }
 
-	final Drawable clearIcon = getResources().getDrawable(R.drawable.navigation_cancel);
-	final Drawable searchIcon = getResources().getDrawable(R.drawable.action_search);
-	articleSearchtextView.measure(MeasureSpec.UNSPECIFIED,MeasureSpec.UNSPECIFIED);
-	int height = articleSearchtextView.getMeasuredHeight()-articleSearchtextView.getPaddingTop()-articleSearchtextView.getPaddingBottom();
-	clearIcon.setBounds(0, 0, height, height);
-	searchIcon.setBounds(0, 0, height, height);
-	articleSearchtextView.setCompoundDrawablePadding(5);
-	articleSearchtextView.setCompoundDrawables(searchIcon, null, articleSearchtextView.getText().toString().equals("") ? null : clearIcon, null);
-	articleSearchtextView.setOnTouchListener(new OnTouchListener() {
-	    @Override
-	    public boolean onTouch(View v, MotionEvent event) {
-		if (articleSearchtextView.getCompoundDrawables()[2] == null) {
-		    return false;
-		}
-		if (event.getAction() != MotionEvent.ACTION_UP) {
-		    return false;
-		}
-		if (event.getX() > articleSearchtextView.getWidth() - articleSearchtextView.getPaddingRight() - clearIcon.getIntrinsicWidth()) {
-			articleSearchtextView.setText("");
-			articleSearchtextView.setCompoundDrawables(searchIcon, null, null, null);
-		}
-		return false;
-	    }
-	});
-	articleSearchtextView.addTextChangedListener(new TextWatcher() {
-	    @Override
-	    public void onTextChanged(CharSequence s, int start, int before, int count) {
-		articleSearchtextView.setCompoundDrawables(searchIcon, null, articleSearchtextView.getText().toString().equals("") ? null : clearIcon, null);
-	    }
+            @Override
+            public void onPageSelected(int position) {
+                // Update the tab position
+                if (mActionBar.getNavigationMode() == ActionBar.NAVIGATION_MODE_TABS
+                        || mActionBar.getNavigationMode() == ActionBar.NAVIGATION_MODE_LIST) {
+                    mActionBar.setSelectedNavigationItem(position);
+                }
 
-	    @Override
-	    public void afterTextChanged(Editable arg0) {
-	    }
-
-	    @Override
-	    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-	    }
-	});
-	// Create the adapter and set it to the AutoCompleteTextView
-	adapter = new AutoCompleteAdapter(this, android.R.layout.simple_list_item_1);
-	articleSearchtextView.setAdapter(adapter);
-
-	articleSearchtextView.setOnItemClickListener(new OnItemClickListener() {
-
-			@Override
-			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-				articleSearchtextView.setText(parent.getItemAtPosition(position).toString());
-				InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-				imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(),0);
-				openArticleFromSearch();
-			}
-		});
-	articleSearchtextView.setOnEditorActionListener(new OnEditorActionListener() {
-
-	    @Override
-	    public boolean onEditorAction(TextView v, int actionId,
-		    KeyEvent event) {
-			//Do Stuff
-			return openArticleFromSearch();
-	 }});
-	articleSearchtextView.setInputType(InputType.TYPE_CLASS_TEXT);
-
-	// js includes will not happen unless we enable JS
-	webView.getSettings().setJavaScriptEnabled(true);
-	//Does not seem to have  impact. (Idea was that
-	// web page is rendered before loading all pictures)
-	//webView.getSettings().setRenderPriority(RenderPriority.HIGH);
-	final Activity activity = this;
-
-	webView.setWebChromeClient(new WebChromeClient(){
-
-				public void onProgressChanged(WebView view, int progress) {
-				 activity.setProgress(progress * 100);
-			 if (progress==100) {
-
-				 Log.d("kiwix", "Loading article finished.");
-				 if (requestClearHistoryAfterLoad) {
-					 Log.d("kiwix", "Loading article finished and requestClearHistoryAfterLoad -> clearHistory");
-					 webView.clearHistory();
-					 requestClearHistoryAfterLoad=false;
-				 }
-
-				 Log.d("kiwix", "Loaded URL: "+webView.getUrl());
-				 if(NightMode){
-						NightMode=false;
-						ToggleNightMode();
-					}
-
-			 }
-			 }
-	});
-
-//	 Should basically resemble the behavior when setWebClient not done
-//	      (i.p. internal urls load in webview, external urls in browser)
-//			  as currently no custom setWebViewClient required it is commented
-		webView.setWebViewClient(new WebViewClient() {
-
-
-
-			@Override
-		public boolean shouldOverrideUrlLoading(WebView view, String url) {
-		if (url.startsWith(ZimContentProvider.CONTENT_URI.toString())) {
-		    // This is my web site, so do not override; let my WebView load the page
-		    return false;
-		} else if (url.startsWith("file://")) {
-		    // To handle help page (loaded from resources)
-		    return true;
-
-		} else if (url.startsWith("javascript:")){
-		    // Allow javascript for HTML functions and code execution (EX: night mode)
-		    return true;
-
-		} else if (url.startsWith(ZimContentProvider.UI_URI.toString())) {
-			// To handle links which access user interface (i.p. used in help page)
-			if (url.equals(ZimContentProvider.UI_URI.toString()+"selectzimfile")) {
-				selectZimFile();
-			} else if (url.equals(ZimContentProvider.UI_URI.toString()+"gotohelp")) {
-				showHelp();
-			} else {
-				Log.e("kiwix", "UI Url "+url+ " not supported.");
-			}
-			return true;
-		}
-		// Otherwise, the link is not for a page on my site, so launch another Activity that handles URLs
-		Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-		startActivity(intent);
-		return true;
-	    }
-
-		public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-		     String errorString = String.format(getResources().getString(R.string.error_articleurlnotfound), failingUrl);
-		     //TODO apparently screws up back/forward
-		     webView.loadDataWithBaseURL("file://error","<html><body>"+errorString+"</body></html>", "text/html", "utf-8", failingUrl);
-		     String title = getResources().getString(R.string.app_name);
-		     getActionBar().setTitle(title);
-		   }
-
-		public void onPageFinished(WebView view, String url) {
-
-		       //register a {@KiwixWebView.OnPageChangeListener} to get changes in scroll position
-		       webView.registerOnPageChangedListener(new KiwixWebView.OnPageChangeListener() {
-			   @Override
-			   public void onPageChanged(int page, int maxPages) {
-			       if (isButtonEnabled)
-			       {
-				   //Don't go on the values these are observed to be working :p
-				   //Simple logic if scrolled to more than the threshold then show the button.
-				   if (page > 0)
-				   {
-				       if (KiwixMobileActivity.this.findViewById(R.id.button_backtotop).getVisibility() == View.INVISIBLE)
-				       {
-					   KiwixMobileActivity.this.findViewById(R.id.button_backtotop).setVisibility(View.VISIBLE);
-					   //U said you wanted fancy huh,then this might just do it.
-					   KiwixMobileActivity.this.findViewById(R.id.button_backtotop).startAnimation(AnimationUtils.loadAnimation(KiwixMobileActivity.this,android.R.anim.fade_in));
-				       }
-				   }
-				   else
-				   {
-				       if (KiwixMobileActivity.this.findViewById(R.id.button_backtotop).getVisibility() == View.VISIBLE)
-				       {
-					   KiwixMobileActivity.this.findViewById(R.id.button_backtotop).setVisibility(View.INVISIBLE);
-					   //U said you wanted fancy huh,then this might just do it.
-					   KiwixMobileActivity.this.findViewById(R.id.button_backtotop).startAnimation(AnimationUtils.loadAnimation(KiwixMobileActivity.this,android.R.anim.fade_out));
-				       }
-				   }
-			       }
-			   }
-			});
-
-			String title = getResources().getString(R.string.app_name);
-			if (webView.getTitle()!=null && !webView.getTitle().isEmpty())
-				title = webView.getTitle();
-			getActionBar().setTitle(title);
-			//Workaround for #643
-			if (requestWebReloadOnFinished>0) {
-				requestWebReloadOnFinished = requestWebReloadOnFinished-1;
-				Log.d("kiwix", "Workaround for #643: onPageFinished. Trigger reloading. ("+requestWebReloadOnFinished+" reloads left to do)");
-				view.reload();
-			}
-		}
-		 });
-
-	loadPref();
-
-	//webView.getSettings().setLoadsImagesAutomatically(false);
-	//Does not make much sense to cache data from zim files.(Not clear whether
-	// this actually has any effect)
-	webView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
-	if (getIntent().getData()!=null) {
-		String filePath = getIntent().getData().getPath();
-	    Log.d("kiwix", " Kiwix started from a filemanager. Intent filePath: "+filePath+" -> open this zimfile and load main page");
-	    openZimFile(new File(filePath), false);
-
-	} else if (savedInstanceState!=null) {
-		 Log.d("kiwix", " Kiwix started with a savedInstanceState (That is was closed by OS) -> restore webview state and zimfile (if set)");
-		 if (savedInstanceState.getString("currentzimfile")!=null) {
-				openZimFile(new File(savedInstanceState.getString("currentzimfile")), false);
-
-		 }
-		 // Restore the state of the WebView
-		 // (Very ugly) Workaround for	#643 Android article blank after rotation and app reload
-		 // In case of restore state, just reload page multiple times. Probability
-		 // that after two refreshes page is still blank is low.
-		 // TODO: implement better fix
-
-		 requestWebReloadOnFinished = 2;
-		 Log.d("kiwix", "Workaround for #643: reload "+requestWebReloadOnFinished+" times after restoring state");
-
-		 webView.restoreState(savedInstanceState);
-	} else {
-		SharedPreferences settings = getSharedPreferences(PREFS_KIWIX_MOBILE, 0);
-		String zimfile = settings.getString("currentzimfile", null);
-	    if (zimfile != null) {
-		Log.d("kiwix", " Kiwix normal start, zimfile loaded last time -> Open last used zimfile "+zimfile);
-		openZimFile(new File(zimfile), false);
-		// Alternative would be to restore webView state. But more effort to implement, and actually
-			//  fits better normal android behavior if after closing app ("back" button) state is not maintained.
-	    } else {
-		Log.d("kiwix", " Kiwix normal start, no zimfile loaded last time  -> display welcome page");
-		showWelcome();
-	    }
-	}
+                // If the app is in landscape mode, Android will switch the navigationmode from
+                // "NAVIGATION_MODE_TABS" to "NAVIGATION_MODE_LIST" (as long as the app has more than 3 tabs open).
+                // There is no way to update this Spinner without creating an extra adapter for that.
+                // But for that we would have to track each and every title of every tab.
+                // So, instead of doing that, we will traverse through the view hierarchy and find that spinner
+                // ourselves and update it manually on every swipe of the ViewPager.
+                ViewParent root = findViewById(android.R.id.content).getParent();
+                updateListNavigation(root, position);
+                setTabsOnLongClickListener(root);
+            }
+        });
 
+        // Set the initial tab. It's hidden.
+        addNewTab();
     }
 
     @Override
-    public void onConfigurationChanged(Configuration newConfig){
-	super.onConfigurationChanged(newConfig);
-    }
-
-    private void loadPref(){
-	  mySharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-	  String pref_zoom = mySharedPreferences.getString("pref_zoom", "automatic");
-	  Boolean pref_zoom_enabled = mySharedPreferences.getBoolean("pref_zoom_enabled", false);
-	  Boolean pref_nightmode= mySharedPreferences.getBoolean("pref_nightmode", false);
-	  isButtonEnabled = mySharedPreferences.getBoolean("pref_top_button",isButtonEnabled);
-	  if (pref_zoom.equals("automatic")) {
-		 setDefaultZoom();
-	  } else if (pref_zoom.equals("medium")) {
-		  webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
-	  } else if (pref_zoom.equals("small")) {
-		  webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.FAR);
-	  } else if (pref_zoom.equals("large")) {
-		  webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.CLOSE);
-	 } else {
-		 Log.w("kiwix", "pref_displayZoom value ("+pref_zoom+" unknown. Assuming automatic");
-		 webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
-	 }
-
-	 //Pinch to zoom
-	 //This seems to suffer from a bug in Android. If you set to "false" this only apply after a restart of the app.
-	 Log.d("kiwix","pref_zoom_enabled value ("+pref_zoom_enabled+")");
-	 webView.getSettings().setBuiltInZoomControls(true);
-	 webView.getSettings().setDisplayZoomControls(pref_zoom_enabled);
-
-	Log.d("kiwix","pref_top_button value ("+pref_zoom_enabled+")");
-	//DONT register a onSharedPrefenceChangedListener as the activity is haulted when on
-	//PreferenceFrag. so it might cause issues
-	if (!isButtonEnabled)
-	{
-	    if (findViewById(R.id.button_backtotop).getVisibility() == View.VISIBLE)
-		findViewById(R.id.button_backtotop).setVisibility(View.INVISIBLE);
-	}
-
-	//Night mode status
-	Log.d("kiwix","pref_nightmode value ("+pref_nightmode+")");
-	if(NightMode!=pref_nightmode)
-	    ToggleNightMode();
-
-    }
-
-
-    @Override
-    public void onPause() {
-	super.onPause();
-	SharedPreferences settings = getSharedPreferences(PREFS_KIWIX_MOBILE, 0);
-	SharedPreferences.Editor editor = settings.edit();
-	editor.putString("currentzimfile", ZimContentProvider.getZimFile());
-	// Commit the edits!
-	editor.commit();
-
-	Log.d("kiwix", "onPause Save currentzimfile to preferences:"+ZimContentProvider.getZimFile());
+    protected void onDestroy() {
+        finish();
+        super.onDestroy();
     }
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-       super.onSaveInstanceState(outState);
-	// Save the state of the WebView
-
-	webView.saveState(outState);
-	outState.putString("currentzimfile", ZimContentProvider.getZimFile());
-	Log.v("kiwix", "onSaveInstanceState Save currentzimfile to bundle:"+ZimContentProvider.getZimFile()+" and webView state");
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState) {
-	super.onRestoreInstanceState(savedInstanceState);
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-	getMenuInflater().inflate(R.menu.main, menu);
-	this.menu = menu;
-	if (requestInitAllMenuItems) {
-	    initAllMenuItems();
-	}
-	return true;
+        super.onSaveInstanceState(outState);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-	InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
 
-	switch (item.getItemId()) {
-	    case android.R.id.home:
-		Toast.makeText(this, "Tapped home", Toast.LENGTH_SHORT).show();
-		break;
-	    case R.id.menu_search:
-		if (articleSearchBar.getVisibility()!=View.VISIBLE) {
-			showSearchBar();
-		} else {
-			hideSearchBar();
-		}
-		break;
-	    case R.id.menu_searchintext:
-		webView.showFindDialog("", true);
-		break;
-	    case R.id.menu_home:
-		openMainPage();
-		break;
-	    case R.id.menu_forward:
-		if(webView.canGoForward() == true){
-		    webView.goForward();
-		}
-		break;
-	    case R.id.menu_back:
-		if(webView.canGoBack() == true){
-		    menu.findItem(R.id.menu_forward).setVisible(true);
-		    imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(),0);
-                    webView.goBack();
+        mCurrentFragment = getCurrentVisibleFragment();
+
+        switch (item.getItemId()) {
+
+            case R.id.menu_home:
+            case android.R.id.home:
+                mCurrentFragment.openMainPage();
+                break;
+
+            case R.id.menu_search:
+                if (mCurrentFragment.articleSearchBar.getVisibility() != View.VISIBLE) {
+                    mCurrentFragment.showSearchBar();
+                } else {
+                    mCurrentFragment.hideSearchBar();
                 }
                 break;
+
+            case R.id.menu_searchintext:
+                mCurrentFragment.webView.showFindDialog("", true);
+                break;
+
+            case R.id.menu_forward:
+                if (mCurrentFragment.webView.canGoForward()) {
+                    mCurrentFragment.webView.goForward();
+                }
+                break;
+
+            case R.id.menu_back:
+                if (mCurrentFragment.webView.canGoBack()) {
+                    mCurrentFragment.menu.findItem(R.id.menu_forward).setVisible(true);
+                    mCurrentFragment.webView.goBack();
+                }
+                break;
+
             case R.id.menu_randomarticle:
-		imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(),0);
-            	openRandomArticle();
-            	break;
+                mCurrentFragment.openRandomArticle();
+                break;
+
+            case R.id.menu_share:
+                shareKiwix();
+                break;
+
             case R.id.menu_help:
-		imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(),0);
-            	showWelcome();
-            	break;
+                mCurrentFragment.showWelcome();
+                break;
+
             case R.id.menu_openfile:
-		imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(),0);
-		selectZimFile();
-		break;
-	    case R.id.menu_share:
-		shareKiwix();
-		break;
+                mCurrentFragment.selectZimFile();
+                break;
+
             case R.id.menu_exit:
-		imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(),0);
-            	finish();
-            	break;
+                finish();
+                break;
+
             case R.id.menu_settings:
-		imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(),0);
-            	Intent i = new Intent(this, KiwixSettings.class);
-                startActivityForResult(i, PREFERENCES_REQUEST_CODE);
-            	break;
+                // Display the fragment as the main content.
+                mCurrentFragment.selectSettings();
+                break;
+
             case R.id.menu_fullscreen:
-                if(isFullscreenOpened){
+                if (mCurrentFragment.isFullscreenOpened) {
                     closeFullScreen();
-                }else{
+                } else {
                     openFullScreen();
                 }
                 break;
         }
-        
+
         return super.onOptionsItemSelected(item);
     }
 
-	private void selectZimFile() {
-		final Intent target = new Intent(Intent.ACTION_GET_CONTENT);
-		// The MIME data type filter
-		target.setType("*/*");
-		// Only return URIs that can be opened with ContentResolver
-		target.addCategory(Intent.CATEGORY_OPENABLE);
-		//Force use of our file selection component.
-		// (Note may make sense to just define a custom intent instead)
-		target.setComponent(new ComponentName(getPackageName(), getPackageName()+".ZimFileSelectActivity"));
-		try {
-			startActivityForResult(target, ZIMFILESELECT_REQUEST_CODE);
-		} catch (ActivityNotFoundException e) {
-
-		}
-	}
-
-
-    private void showSearchBar() {
-	showSearchBar(true);
-    }
-
-	private void showSearchBar(Boolean focus) {
-		articleSearchBar.setVisibility(View.VISIBLE);
-
-		if (focus) {
-		    articleSearchtextView.requestFocus();
-
-		    //Move cursor to end
-		    articleSearchtextView.setSelection(articleSearchtextView.getText().length());
-
-		    InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-		    imm.toggleSoftInput(InputMethodManager.SHOW_FORCED,0);
-		}
-	}
-
-
-    private void showWelcome() {
-	webView.loadUrl("file:///android_res/raw/welcome.html");
-	}
-
     private void shareKiwix() {
-	Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
-	sharingIntent.setType("text/plain");
+        Intent sharingIntent = new Intent(android.content.Intent.ACTION_SEND);
+        sharingIntent.setType("text/plain");
 
-	String title = getResources().getString(R.string.info_share_title);
-	String shareText = getResources().getString(R.string.info_share_content);
+        String title = getResources().getString(R.string.info_share_title);
+        String shareText = getResources().getString(R.string.info_share_content);
 
-	sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, title);
-	sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, shareText);
-	startActivity(Intent.createChooser(sharingIntent, "Share via"));
-	}
-
-    private void showHelp() {
-	//Load from resource. Use with base url as else no images can be embedded.
-	// Note that this leads inclusion of welcome page in browser history
-	//   This is not perfect, but good enough. (and would be signifcant
-	// effort to remove file)
-	webView.loadUrl("file:///android_res/raw/help.html");
-	}
-
-	@Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-	switch (requestCode) {
-	case ZIMFILESELECT_REQUEST_CODE:
-	    if (resultCode == RESULT_OK) {
-		// The URI of the selected file
-		final Uri uri = data.getData();
-		File file = null;
-		if (uri != null) {
-			String path = uri.getPath();
-			if (path != null)
-				file = new File(path);
-		}
-		if (file==null)
-			return;
-		// Create a File from this Uri
-		openZimFile(file, true);
-	    }
-	    break;
-	case PREFERENCES_REQUEST_CODE:
-
-	     loadPref();
-		break;
-	}
+        sharingIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, title);
+        sharingIntent.putExtra(android.content.Intent.EXTRA_TEXT, shareText);
+        startActivity(Intent.createChooser(sharingIntent, getString(R.string.share_via)));
     }
 
+    private void openFullScreen() {
+        mCurrentFragment = getCurrentVisibleFragment();
 
+        getActionBar().hide();
+        mCurrentFragment.exitFullscreenButton.setVisibility(0);
+        mCurrentFragment.menu.findItem(R.id.menu_fullscreen)
+                .setTitle(getResources().getString(R.string.menu_exitfullscreen));
+        int fullScreenFlag = WindowManager.LayoutParams.FLAG_FULLSCREEN;
+        int classicScreenFlag = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
+        getWindow().addFlags(fullScreenFlag);
+        getWindow().clearFlags(classicScreenFlag);
+        mCurrentFragment.isFullscreenOpened = true;
+    }
 
+    private void closeFullScreen() {
+        mCurrentFragment = getCurrentVisibleFragment();
 
-	private boolean openZimFile(File file, boolean clearHistory) {
-		if (file.exists()) {
-			if (ZimContentProvider.setZimFile(file.getAbsolutePath())!=null) {
-
-
-			getActionBar().setSubtitle(ZimContentProvider.getZimFileTitle());
-				//Apparently with webView.clearHistory() only
-				//    history before currently (fully) loaded page is cleared
-				// -> request clear, actual clear done after load.
-				//    Probably not working in all corners (e.g. zim file openend
-				//    while load in progress, mainpage of new zim file invalid, ...
-				//	 but should be good enough.
-				// Actually probably redundant if no zim file openend before in session,
-				//  but to be on save side don't clear history in such cases.
-				if (clearHistory)
-					requestClearHistoryAfterLoad=true;
-				if (menu!=null) {
-					initAllMenuItems();
-				} else {
-					// Menu may not be initialized yet. In this case
-					// signal to menu create to show
-					requestInitAllMenuItems = true;
-				}
-				openMainPage();
-				showSearchBar(false);
-				return true;
-			} else {
-				Toast.makeText(this, getResources().getString(R.string.error_fileinvalid), Toast.LENGTH_LONG).show();
-			}
-
-		} else {
-			Toast.makeText(this, getResources().getString(R.string.error_filenotfound), Toast.LENGTH_LONG).show();
-		}
-		return false;
-	}
-
-	private void initAllMenuItems() {
-	menu.findItem(R.id.menu_fullscreen).setVisible(true);
-		menu.findItem(R.id.menu_back).setVisible(true);
-		menu.findItem(R.id.menu_forward).setVisible(false);
-		menu.findItem(R.id.menu_home).setVisible(true);
-		menu.findItem(R.id.menu_randomarticle).setVisible(true);
-		menu.findItem(R.id.menu_searchintext).setVisible(true);
-		menu.findItem(R.id.menu_search).setVisible(true);
-	}
+        getActionBar().show();
+        mCurrentFragment.menu.findItem(R.id.menu_fullscreen)
+                .setTitle(getResources().getString(R.string.menu_fullscreen));
+        mCurrentFragment.exitFullscreenButton.setVisibility(4);
+        int fullScreenFlag = WindowManager.LayoutParams.FLAG_FULLSCREEN;
+        int classicScreenFlag = WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
+        getWindow().clearFlags(fullScreenFlag);
+        getWindow().addFlags(classicScreenFlag);
+        mCurrentFragment.isFullscreenOpened = false;
+    }
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-	if(event.getAction() == KeyEvent.ACTION_DOWN){
-	    switch(keyCode)
-	    {
-	    case KeyEvent.KEYCODE_BACK:
-		if(webView.canGoBack() == true){
-			/*WebBackForwardList history = webView.copyBackForwardList();
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            mCurrentFragment = getCurrentVisibleFragment();
 
-			if (history.getCurrentIndex() )*/
+            // handle the back button for the WebView in the current Fragment
+            mCurrentFragment.onKeyDown(keyCode, event);
 
-		    webView.goBack();
-		}else{
-		    finish();
-		}
-		return true;
-	    }
-
-	}
-	return super.onKeyDown(keyCode, event);
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
     }
 
-	private boolean openArticle(String articleUrl) {
-		Log.d("kiwix", articleSearchtextView+" onEditorAction. TextView: "+articleSearchtextView.getText()+ " articleUrl: "+articleUrl);
+    @Override
+    public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
+        mViewPager.setCurrentItem(tab.getPosition(), true);
 
-		if (articleUrl!=null) {
-		    //			hideSearchBar();
-			webView.loadUrl(Uri.parse(ZimContentProvider.CONTENT_URI
-			    +articleUrl).toString());
+        mCurrentFragment = getCurrentVisibleFragment();
 
-			return true;
-		} else {
-			String errorString = String.format(getResources().getString(R.string.error_articlenotfound), articleSearchtextView.getText().toString());
-			Toast.makeText(getWindow().getContext(), errorString, Toast.LENGTH_SHORT).show();
+        // Update the title of the ActionBar. This well get triggered through the onPageSelected() callback
+        // of the ViewPager. We will have to post a Runnable to the message queue of the WebView, otherwise
+        // it might trigger a NullPointerExcaption, if the user swipes this tab away too fast (and therefore
+        // causes the Fragment to not load completely)
+        mCurrentFragment.webView.post(new Runnable() {
+            @Override
+            public void run() {
+                String title = getResources().getString(R.string.app_name);
+                if (mCurrentFragment.webView.getTitle() != null && !mCurrentFragment.webView.getTitle()
+                        .isEmpty()) {
+                    title = mCurrentFragment.webView.getTitle();
+                }
 
-			return true;
-		}
-	}
+                // Check, if the app is in tabs mode. This is necessary, because getting a reference to the
+                // current tab would throw a NullPointerException, if the app were in landscape mode and
+                // therefore possibly in NAVIGATION_MODE_LIST mode
+                if (mActionBar.getNavigationMode() == ActionBar.NAVIGATION_MODE_TABS) {
+                    getActionBar().getSelectedTab().setText(title);
+                }
+            }
+        });
 
-    private void openFullScreen(){
-	getActionBar().hide();
-	exitFullscreenButton.setVisibility(0);
-	menu.findItem(R.id.menu_fullscreen).setTitle(getResources().getString(R.string.menu_exitfullscreen));
-	int fullScreenFlag=WindowManager.LayoutParams.FLAG_FULLSCREEN;
-	int classicScreenFlag=WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
-	getWindow().addFlags(fullScreenFlag);
-	getWindow().clearFlags(classicScreenFlag);
-	isFullscreenOpened=true;
     }
 
-    private void closeFullScreen(){
-	getActionBar().show();
-	menu.findItem(R.id.menu_fullscreen).setTitle(getResources().getString(R.string.menu_fullscreen));
-	exitFullscreenButton.setVisibility(4);
-	int fullScreenFlag=WindowManager.LayoutParams.FLAG_FULLSCREEN;
-	int classicScreenFlag=WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN;
-	getWindow().clearFlags(fullScreenFlag);
-	getWindow().addFlags(classicScreenFlag);
-	isFullscreenOpened=false;
+    @Override
+    public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
+        reattachOnLongClickListener();
     }
 
-	private boolean openArticleFromSearch() {
-		Log.d("kiwix", "openArticleFromSearch: "+articleSearchtextView.getText());
-		String articleTitle = articleSearchtextView.getText().toString();
-		String articleUrl = ZimContentProvider.getPageUrlFromTitle(articleTitle);
-		return openArticle(articleUrl);
-	}
+    @Override
+    public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
+        reattachOnLongClickListener();
+    }
 
-	private boolean openRandomArticle() {
-		String articleUrl = ZimContentProvider.getRandomArticleUrl();
-		Log.d("kiwix", "openRandomArticle: "+articleUrl);
-		return openArticle(articleUrl);
-	}
+    @Override
+    public void removeTabAt(int position) {
 
+        final ActionBar.Tab tab = mActionBar.getTabAt(position);
 
-	private boolean openMainPage() {
-	String articleUrl = ZimContentProvider.getMainPage();
-	return openArticle(articleUrl);
-	}
+        // Check if the tab, that gets removed is the first tab. If true, then shift the user to the
+        // first tab to the right. Otherwise select the Fragment, that is one to the left.
+        if (tab.getPosition() == 0) {
+            mViewPager.setCurrentItem(tab.getPosition() + 1, true);
+        } else {
+            mViewPager.setCurrentItem(tab.getPosition(), true);
+        }
 
-	public boolean isTablet(Context context) {
-	    return (context.getResources().getConfiguration().screenLayout
-		    & Configuration.SCREENLAYOUT_SIZE_MASK)
-		    >= Configuration.SCREENLAYOUT_SIZE_LARGE;
-	}
+        mActionBar.removeTabAt(tab.getPosition());
+        mViewPagerAdapter.removeFragment(tab.getPosition());
+        mViewPagerAdapter.notifyDataSetChanged();
 
-	private void hideSearchBar() {
-		// Hide searchbar
-		articleSearchBar.setVisibility(View.GONE);
-		// To close softkeyboard
-		webView.requestFocus();
-		//Seems not really be necessary
-		InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-		imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(),0);
-	}
+        if (mActionBar.getTabCount() == 1) {
+            mActionBar.setTitle(mActionBar.getSelectedTab().getText());
+            mActionBar.setSubtitle(ZimContentProvider.getZimFileTitle());
+            mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+        }
+    }
 
-	private void ToggleNightMode(){
+    private void removeCurrentTab() {
+        int position = mActionBar.getSelectedTab().getPosition();
+        removeTabAt(position);
+    }
 
-		try {
-			InputStream stream = getAssets().open("invertcode.js");
-			int size = stream.available();
-			byte[] buffer = new byte[size];
-			stream.read(buffer);
-			stream.close();
-			String JSInvert = new String(buffer);
-			webView.loadUrl("javascript:"+JSInvert);
-			NightMode = !NightMode;
-		} catch (IOException e) {
+    // Find the Spinner in the ActionBar, if the ActionBar is in NAVIGATION_MODE_LIST mode
+    private boolean updateListNavigation(Object root, int position) {
+        if (root instanceof android.widget.Spinner) {
+            // Found the Spinner
+            Spinner spinner = (Spinner) root;
+            spinner.setSelection(position);
+            return true;
+        } else if (root instanceof ViewGroup) {
+            ViewGroup group = (ViewGroup) root;
+            if (group.getId() != android.R.id.content) {
+                // Found a container that isn't the container holding our screen layout
+                for (int i = 0; i < group.getChildCount(); i++) {
+                    if (updateListNavigation(group.getChildAt(i), position)) {
+                        // Found and done searching the View tree
+                        return true;
+                    }
+                }
+            }
+        }
+        // Found nothing
+        return false;
+    }
 
-		}
-	}
+    // Set an OnLongClickListener on all active ActionBar Tabs
+    private boolean setTabsOnLongClickListener(Object root) {
 
-	private void setDefaultZoom() {
-		DisplayMetrics metrics = new DisplayMetrics();
-		getWindowManager().getDefaultDisplay().getMetrics(metrics);
+        // Found the container, that holds the Tabs. This is the ScrollContainerView to be specific,
+        // but checking against that class is not possible, since it's part of the hidden API.
+        // We will check, if root is an derivative of HorizontalScrollView instead,
+        // since ScrollContainerView extends HorizontalScrollView.
+        if (root instanceof HorizontalScrollView) {
+            // The Tabs are all wraped in a LinearLayout
+            root = ((ViewGroup) root).getChildAt(0);
+            if (root instanceof LinearLayout) {
+                // Found the Tabs. Now we can set an OnLongClickListener on all of them.
+                for (int i = 0; i < ((ViewGroup) root).getChildCount(); i++) {
+                    LinearLayout child = ((LinearLayout) ((ViewGroup) root).getChildAt(i));
+                    child.setOnLongClickListener(this);
+                    child.setTag(R.id.action_bar_tab_id, i);
+                }
+                return true;
+            }
+            // Search ActionBar and the Tabs. Exclude the content of the app from this search.
+        } else if (root instanceof ViewGroup) {
+            ViewGroup group = (ViewGroup) root;
+            if (group.getId() != android.R.id.content) {
+                // Found a container that isn't the container holding our screen layout.
+                // The Tabs have to be in here.
+                for (int i = 0; i < group.getChildCount(); i++) {
+                    if (setTabsOnLongClickListener(group.getChildAt(i))) {
+                        // Found and done searching the View tree
+                        return true;
+                    }
+                }
+            }
+        }
+        // Found nothing
+        return false;
+    }
 
-		//Cleaner than approach used in 1.0 to set CLOSE for tables, MEDIUM for phones.
-		// However, unfortunately at least on Samsung Galaxy Tab 2 density is medium.
-		// Anyway, user can now override so it should be ok.
-		switch (metrics.densityDpi) {
-		case DisplayMetrics.DENSITY_HIGH:
-			Log.d("kiwix", "setDefaultZoom for Display DENSITY_HIGH-> ZoomDensity.FAR ");
-		    webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.FAR);
-		    break;
+    // We have to reattach the listeners on the Tabs, because they keep getting deattached every time the user
+    // swipes between the pages.
+    public void reattachOnLongClickListener() {
+        ViewParent root = findViewById(android.R.id.content).getParent();
+        setTabsOnLongClickListener(root);
+    }
 
-		case DisplayMetrics.DENSITY_MEDIUM:
-			Log.d("kiwix", "setDefaultZoom for Display DENSITY_MEDIUM-> ZoomDensity.MEDIUM ");
-		    webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
-		    break;
+    @Override
+    public void addNewTab(final String url) {
 
-		case DisplayMetrics.DENSITY_LOW:
-			Log.d("kiwix", "setDefaultZoom for Display DENSITY_LOW-> ZoomDensity.CLOSE ");
-		    webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.CLOSE);
-		    break;
+        addNewTab();
+        mCurrentFragment = getCurrentVisibleFragment();
 
-		default:
-			Log.d("kiwix", "setDefaultZoom for Display OTHER -> ZoomDensity.MEDIUM ");
-		    webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
-		    break;
-		}
-	}
+        mCurrentFragment.webView.post(new Runnable() {
+            @Override
+            public void run() {
+                mCurrentFragment.webView.loadUrl(url);
+            }
+        });
+
+    }
+
+    @Override
+    public void closeFullScreenMode() {
+        closeFullScreen();
+    }
+
+    @Override
+    public int getPositionOfTab() {
+        return mCurrentDraggedTab;
+    }
+
+    private void addNewTab() {
+
+        // If it's the first (visible) tab, then switch the navigation mode from  NAVIGATION_MODE_NORMAL to
+        // NAVIGATION_MODE_TABS and show tabs
+        if (NUM_ITEMS == 1) {
+            mActionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+            mCurrentFragment = getCurrentVisibleFragment();
+
+            String title = getResources().getString(R.string.app_name);
+            if (mCurrentFragment.webView.getTitle() != null &&
+                    !mCurrentFragment.webView.getTitle().isEmpty()) {
+                title = mCurrentFragment.webView.getTitle();
+            }
+
+            // Set the title for the selected Tab
+            if (mActionBar.getNavigationMode() == ActionBar.NAVIGATION_MODE_TABS) {
+                getActionBar().getSelectedTab().setText(title);
+            }
+        }
+
+        mActionBar.addTab(mActionBar.newTab().setTabListener(this));
+
+        NUM_ITEMS = NUM_ITEMS + 1;
+        mViewPagerAdapter.notifyDataSetChanged();
+
+        if (mActionBar.getTabCount() > 1) {
+            mActionBar.setTitle(ZimContentProvider.getZimFileTitle());
+            mActionBar.setSubtitle(null);
+        }
+
+        new Handler(Looper.getMainLooper()).post(new Runnable() {
+            @Override
+            public void run() {
+                mViewPager.setCurrentItem(mActionBar.getTabCount() - 1, true);
+            }
+        });
+        reattachOnLongClickListener();
+    }
+
+    // This method gets a reference to the fragment, that is currently visible in the ViewPager
+    private KiwixMobileFragment getCurrentVisibleFragment() {
+
+        return ((KiwixMobileFragment) mViewPagerAdapter.
+                getFragmentAtPosition(mViewPager.getCurrentItem()));
+    }
+
+    @Override
+    public boolean onLongClick(View v) {
+        View.DragShadowBuilder shadowBuilder = new View.DragShadowBuilder(v);
+
+        mCurrentDraggedTab = (Integer) v.getTag(R.id.action_bar_tab_id);
+
+        mTabsWidth = v.getWidth();
+        mTabsHeight = v.getHeight();
+
+        getCurrentVisibleFragment().handleTabDeleteCross();
+
+        v.startDrag(null, shadowBuilder, v, 0);
+
+        return true;
+    }
+
+    // Delete the current Tab, that is being dragged, if it hits the bounds of the Screen
+    @Override
+    public boolean onDrag(View v, DragEvent event) {
+
+        DisplayMetrics displaymetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
+
+        // Get the height of the title bar
+        final int titleBarHeight;
+
+        switch (displaymetrics.densityDpi) {
+
+            case DisplayMetrics.DENSITY_HIGH:
+                titleBarHeight = 48;
+                break;
+
+            case DisplayMetrics.DENSITY_MEDIUM:
+                titleBarHeight = 32;
+                break;
+
+            case DisplayMetrics.DENSITY_LOW:
+                titleBarHeight = 24;
+                break;
+
+            default:
+                titleBarHeight = 0;
+        }
+
+        // Get the width and height of the screen
+        final int screenHeight = displaymetrics.heightPixels;
+        final int screenWidth = displaymetrics.widthPixels;
+
+        // Get the current position of the View, that is being dragged
+        final int positionX = (int) event.getX();
+        final int positionY = (int) event.getY();
+
+        if (event.getAction() == DragEvent.ACTION_DRAG_EXITED) {
+
+            removeTabAt(mCurrentDraggedTab);
+            return true;
+        }
+
+        if (event.getAction() == DragEvent.ACTION_DROP) {
+
+            // Does it hit the boundries on the x-axis?
+            if ((positionX > screenWidth - (0.25 * mTabsWidth)) ||
+                    (positionX < (0.25 * mTabsWidth))) {
+                Log.i("kiwix", "Dragged out");
+                removeTabAt(mCurrentDraggedTab);
+            }
+            // Does it hit the boundries on the y-axis?
+            else if ((positionY > screenHeight - (0.25 * mTabsHeight)) ||
+                    ((positionY - titleBarHeight) < (0.5 * mTabsHeight))) {
+                Log.i("kiwix", "Dragged out");
+                removeTabAt(mCurrentDraggedTab);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public class ViewPagerAdapter extends FragmentStatePagerAdapter {
+
+        // Keep track of the active Fragments
+        SparseArray<Fragment> tabs = new SparseArray<Fragment>();
+
+        public ViewPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int i) {
+
+            Fragment fragment = new KiwixMobileFragment();
+            tabs.put(i, fragment);
+            return fragment;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            tabs.remove(position);
+            super.destroyItem(container, position, object);
+        }
+
+        @Override
+        public int getCount() {
+            return NUM_ITEMS;
+        }
+
+        public void removeFragment(int position) {
+            tabs.remove(position);
+            NUM_ITEMS = NUM_ITEMS - 1;
+            mViewPagerAdapter.notifyDataSetChanged();
+        }
+
+        // Gets the current visible Fragment or returns a new Fragment, if that fails
+        public Fragment getFragmentAtPosition(int position) {
+            return tabs.get(position) == null ? new KiwixMobileFragment() : tabs.get(position);
+        }
+    }
 }
-
diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileFragment.java b/src/org/kiwix/kiwixmobile/KiwixMobileFragment.java
new file mode 100644
index 000000000..25fd23bea
--- /dev/null
+++ b/src/org/kiwix/kiwixmobile/KiwixMobileFragment.java
@@ -0,0 +1,913 @@
+package org.kiwix.kiwixmobile;
+
+import android.annotation.SuppressLint;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.TextWatcher;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.DragEvent;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.MeasureSpec;
+import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
+import android.view.animation.AnimationUtils;
+import android.view.inputmethod.InputMethodManager;
+import android.webkit.WebChromeClient;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.AutoCompleteTextView;
+import android.widget.Button;
+import android.widget.Filter;
+import android.widget.Filterable;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.TextView.OnEditorActionListener;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+
+public class KiwixMobileFragment extends Fragment {
+
+    public static final String TAG_KIWIX = "kiwix";
+
+    private static final String TAG_CURRENTZIMFILE = "currentzimfile";
+
+    private static final String TAG_CURRENTARTICLE = "currentarticle";
+
+    private static final String PREF_ZOOM = "pref_zoom";
+
+    private static final String PREF_NIGHTMODE = "pref_nightmode";
+
+    private static final String PREF_ZOOM_ENABLED = "pref_zoom_enabled";
+
+    private static final String PREFS_KIWIX_MOBILE = "kiwix-mobile";
+
+    private static final String AUTOMATIC = "automatic";
+
+    private static final String MEDIUM = "medium";
+
+    private static final String SMALL = "small";
+
+    private static final String LARGE = "large";
+
+    private static final int ZIMFILESELECT_REQUEST_CODE = 1234;
+
+    private static final int PREFERENCES_REQUEST_CODE = 1235;
+
+    public LinearLayout articleSearchBar;
+
+    public Menu menu;
+
+    public KiwixWebView webView;
+
+    public boolean isFullscreenOpened;
+
+    public ImageButton exitFullscreenButton;
+
+    protected boolean requestClearHistoryAfterLoad;
+
+    protected boolean requestInitAllMenuItems;
+
+    protected boolean nightMode;
+
+    protected int requestWebReloadOnFinished;
+
+    private SharedPreferences mySharedPreferences;
+
+    private boolean isButtonEnabled = true;
+
+    private AutoCompleteTextView articleSearchtextView;
+
+    private ArrayAdapter<String> adapter;
+
+    private Button mBackToTopButton;
+
+    private LinearLayout mTabDeleteCross;
+
+    private FragmentCommunicator mFragmentCommunicator;
+
+    @Override
+    public void setRetainInstance(boolean retain) {
+        super.setRetainInstance(retain);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+
+        final View root = inflater.inflate(R.layout.main, container, false);
+
+        webView = (KiwixWebView) root.findViewById(R.id.webview);
+
+        mBackToTopButton = (Button) root.findViewById(R.id.button_backtotop);
+
+        mTabDeleteCross = (LinearLayout) root.findViewById(R.id.remove_tab);
+
+        exitFullscreenButton = (ImageButton) root.findViewById(R.id.FullscreenControlButton);
+
+        exitFullscreenButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mFragmentCommunicator.closeFullScreenMode();
+            }
+        });
+
+        webView.setOnPageChangedListener(new KiwixWebView.OnPageChangeListener() {
+
+            @Override
+            public void onPageChanged(int page, int maxPages) {
+                if (isButtonEnabled) {
+
+                    if (((double) page / maxPages) >= 0.1) {
+                        if (mBackToTopButton.getVisibility() == View.INVISIBLE) {
+                            mBackToTopButton.setText(R.string.button_backtotop);
+                            mBackToTopButton.setVisibility(View.VISIBLE);
+                            mBackToTopButton.startAnimation(
+                                    AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_in));
+                        }
+                    } else {
+                        if (mBackToTopButton.getVisibility() == View.VISIBLE) {
+                            mBackToTopButton.setVisibility(View.INVISIBLE);
+                            //U said you wanted fancy huh,then this might just do it.
+                            mBackToTopButton.startAnimation(
+                                    AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_out));
+                        }
+                    }
+                }
+            }
+        });
+
+        webView.setOnLongClickListener(new KiwixWebView.OnLongClickListener() {
+
+            @Override
+            public void onLongClick(final String url) {
+                boolean handleEvent = false;
+                if (url.startsWith(ZimContentProvider.CONTENT_URI.toString())) {
+                    // This is my web site, so do not override; let my WebView load the page
+                    handleEvent = true;
+
+                } else if (url.startsWith("file://")) {
+                    // To handle help page (loaded from resources)
+                    handleEvent = true;
+
+                } else if (url.startsWith(ZimContentProvider.UI_URI.toString())) {
+                    handleEvent = true;
+                }
+
+                if (handleEvent) {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+                    builder.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int id) {
+                            mFragmentCommunicator.addNewTab(url);
+                        }
+                    });
+                    builder.setNegativeButton(android.R.string.no, null);
+                    builder.setMessage(getString(R.string.open_in_new_tab));
+                    AlertDialog dialog = builder.create();
+                    dialog.show();
+                }
+            }
+        });
+
+        mTabDeleteCross.setOnDragListener(new View.OnDragListener() {
+            @Override
+            public boolean onDrag(View v, DragEvent event) {
+
+                switch (event.getAction()) {
+
+                    case DragEvent.ACTION_DROP:
+                        int tabPosition = mFragmentCommunicator.getPositionOfTab();
+                        mFragmentCommunicator.removeTabAt(tabPosition);
+
+                    case DragEvent.ACTION_DRAG_ENDED:
+                        mTabDeleteCross.startAnimation(
+                                AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_out));
+                        mTabDeleteCross.setVisibility(View.INVISIBLE);
+                        mTabDeleteCross.getBackground().clearColorFilter();
+                }
+                return true;
+            }
+        });
+
+        articleSearchBar = (LinearLayout) root.findViewById(R.id.articleSearchBar);
+        articleSearchtextView = (AutoCompleteTextView) root.findViewById(R.id.articleSearchTextView);
+        final Drawable clearIcon = getResources().getDrawable(R.drawable.navigation_cancel);
+        final Drawable searchIcon = getResources().getDrawable(R.drawable.action_search);
+
+        if (savedInstanceState != null) {
+            webView.restoreState(savedInstanceState);
+        }
+
+        articleSearchtextView.measure(MeasureSpec.UNSPECIFIED, MeasureSpec.UNSPECIFIED);
+        int height = articleSearchtextView.getMeasuredHeight() - articleSearchtextView.getPaddingTop()
+                - articleSearchtextView.getPaddingBottom();
+
+        clearIcon.setBounds(0, 0, height, height);
+        searchIcon.setBounds(0, 0, height, height);
+
+        articleSearchtextView.setCompoundDrawablePadding(5);
+        articleSearchtextView.setCompoundDrawables(searchIcon, null,
+                articleSearchtextView.getText().toString().equals("") ? null : clearIcon, null);
+
+        final Drawable clearIcon2 = clearIcon;
+        final Drawable searchIcon2 = searchIcon;
+
+        articleSearchtextView.setOnTouchListener(new OnTouchListener() {
+
+            private final Drawable mClearIcon = clearIcon2;
+
+            private final Drawable mSearchIcon = searchIcon2;
+
+            @Override
+            public boolean onTouch(View v, MotionEvent event) {
+                if (articleSearchtextView.getCompoundDrawables()[2] == null) {
+                    return false;
+                }
+                if (event.getAction() != MotionEvent.ACTION_UP) {
+                    return false;
+                }
+                if (event.getX() > articleSearchtextView.getWidth() - articleSearchtextView.getPaddingRight()
+                        - mClearIcon.getIntrinsicWidth()) {
+                    articleSearchtextView.setText("");
+                    articleSearchtextView.setCompoundDrawables(mSearchIcon, null, null, null);
+                }
+                return false;
+            }
+        });
+
+        final Drawable searchIcon1 = searchIcon;
+        final Drawable clearIcon1 = clearIcon;
+
+        articleSearchtextView.addTextChangedListener(new TextWatcher() {
+            private final Drawable mSearchIcon = searchIcon1;
+
+            private final Drawable mClearIcon = clearIcon1;
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                articleSearchtextView.setCompoundDrawables(mSearchIcon, null,
+                        articleSearchtextView.getText().toString().equals("") ? null : mClearIcon,
+                        null);
+            }
+
+            @Override
+            public void afterTextChanged(Editable arg0) {
+            }
+
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+        });
+
+        // Create the adapter and set it to the AutoCompleteTextView
+        adapter = new AutoCompleteAdapter(getActivity(),
+                android.R.layout.simple_list_item_1);
+        articleSearchtextView.setAdapter(adapter);
+        articleSearchtextView.setOnItemClickListener(new OnItemClickListener() {
+
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                articleSearchtextView.setText(parent.getItemAtPosition(position).toString());
+                openArticleFromSearch();
+            }
+        });
+
+        articleSearchtextView.setOnEditorActionListener(new OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId,
+                    KeyEvent event) {
+                return openArticleFromSearch();
+            }
+        });
+
+        articleSearchtextView.setInputType(InputType.TYPE_CLASS_TEXT);
+
+        // js includes will not happen unless we enable JS
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.setWebChromeClient(new MyWebChromeClient());
+        root.findViewById(R.id.button_backtotop).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                webView.pageUp(true);
+            }
+        });
+
+        // Should basically resemble the behavior when setWebClient not done
+        // (i.p. internal urls load in webview, external urls in browser)
+        // as currently no custom setWebViewClient required it is commented
+        webView.setWebViewClient(new MyWebViewClient());
+
+        loadPrefs();
+
+        // webView.getSettings().setLoadsImagesAutomatically(false);
+        // Does not make much sense to cache data from zim files.(Not clear whether
+        // this actually has any effect)
+        webView.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
+
+        if (getActivity().getIntent().getData() != null) {
+            String filePath = getActivity().getIntent().getData().getPath();
+            Log.d(TAG_KIWIX, " Kiwix started from a filemanager. Intent filePath: " + filePath
+                    + " -> open this zimfile and load main page");
+            openZimFile(new File(filePath), false);
+
+        } else if (savedInstanceState != null) {
+            Log.d(TAG_KIWIX,
+                    " Kiwix started with a savedInstanceState (That is was closed by OS) -> restore webview state and zimfile (if set)");
+            if (savedInstanceState.getString(TAG_CURRENTZIMFILE) != null) {
+                openZimFile(new File(savedInstanceState.getString(TAG_CURRENTZIMFILE)), false);
+            }
+            if (savedInstanceState.getString(TAG_CURRENTARTICLE) != null) {
+                webView.loadUrl(savedInstanceState.getString(TAG_CURRENTARTICLE));
+
+            }
+            webView.restoreState(savedInstanceState);
+
+            // Restore the state of the WebView
+            // (Very ugly) Workaround for  #643 Android article blank after rotation and app reload
+            // In case of restore state, just reload page multiple times. Probability
+            // that after two refreshes page is still blank is low.
+            // TODO: implement better fix
+            requestWebReloadOnFinished = 2;
+            Log.d(TAG_KIWIX, "Workaround for #643: reload " + requestWebReloadOnFinished
+                    + " times after restoring state");
+
+        } else {
+            SharedPreferences settings = getActivity().getSharedPreferences(PREFS_KIWIX_MOBILE, 0);
+            String zimFile = settings.getString(TAG_CURRENTZIMFILE, null);
+            if (zimFile != null) {
+                Log.d(TAG_KIWIX, " Kiwix normal start, zimFile loaded last time -> Open last used zimFile "
+                        + zimFile);
+                openZimFile(new File(zimFile), false);
+                // Alternative would be to restore webView state. But more effort to implement, and actually
+                // fits better normal android behavior if after closing app ("back" button) state is not maintained.
+            } else {
+                Log.d(TAG_KIWIX, " Kiwix normal start, no zimFile loaded last time  -> display welcome page");
+                showWelcome();
+            }
+        }
+
+        return root;
+    }
+
+    @SuppressLint("SetJavaScriptEnabled")
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+
+        setHasOptionsMenu(true);
+        requestClearHistoryAfterLoad = false;
+        requestWebReloadOnFinished = 0;
+        requestInitAllMenuItems = false;
+        nightMode = false;
+        isFullscreenOpened = false;
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+
+        switch (requestCode) {
+            case ZIMFILESELECT_REQUEST_CODE:
+                if (resultCode == Activity.RESULT_OK) {
+                    // The URI of the selected file
+                    final Uri uri = data.getData();
+                    File file = null;
+                    if (uri != null) {
+                        String path = uri.getPath();
+                        if (path != null) {
+                            file = new File(path);
+                        }
+                    }
+                    if (file == null) {
+                        return;
+                    }
+                    // Create a File from this Uri
+                    openZimFile(file, true);
+                    new Handler(Looper.getMainLooper()).post(new Runnable() {
+                        @Override
+                        public void run() {
+                            getActivity().finish();
+                            startActivity(new Intent(getActivity(), KiwixMobileActivity.class));
+                        }
+                    });
+                }
+                break;
+            case PREFERENCES_REQUEST_CODE:
+                loadPrefs();
+                getActivity().finish();
+                startActivity(new Intent(getActivity(), KiwixMobileActivity.class));
+                break;
+        }
+
+        super.onActivityResult(requestCode, resultCode, data);
+    }
+
+    public void loadPrefs() {
+        mySharedPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
+        String pref_zoom = mySharedPreferences.getString(PREF_ZOOM, AUTOMATIC);
+        Boolean pref_zoom_enabled = mySharedPreferences.getBoolean(PREF_ZOOM_ENABLED, false);
+        Boolean pref_nightmode = mySharedPreferences.getBoolean(PREF_NIGHTMODE, false);
+        isButtonEnabled = mySharedPreferences.getBoolean("pref_top_button", isButtonEnabled);
+
+        if (pref_zoom.equals(AUTOMATIC)) {
+            setDefaultZoom();
+        } else if (pref_zoom.equals(MEDIUM)) {
+            webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
+        } else if (pref_zoom.equals(SMALL)) {
+            webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.FAR);
+        } else if (pref_zoom.equals(LARGE)) {
+            webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.CLOSE);
+        } else {
+            Log.w(TAG_KIWIX, "pref_displayZoom value (" + pref_zoom + " unknown. Assuming automatic");
+            webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
+        }
+
+        // Pinch to zoom
+        // This seems to suffer from a bug in Android. If you set to "false" this only apply after a restart of the app.
+        Log.d(TAG_KIWIX, "pref_zoom_enabled value (" + pref_zoom_enabled + ")");
+        webView.getSettings().setBuiltInZoomControls(true);
+        webView.getSettings().setDisplayZoomControls(pref_zoom_enabled);
+
+        if (!isButtonEnabled) {
+            if (mBackToTopButton.getVisibility() == View.VISIBLE) {
+                mBackToTopButton.setVisibility(View.INVISIBLE);
+            }
+        }
+
+        // Night mode status
+        Log.d(TAG_KIWIX, "pref_nightmode value (" + pref_nightmode + ")");
+        if (nightMode != pref_nightmode) {
+            ToggleNightMode();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        SharedPreferences settings = getActivity().getSharedPreferences(PREFS_KIWIX_MOBILE, 0);
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putString(TAG_CURRENTZIMFILE, ZimContentProvider.getZimFile());
+        // Commit the edits!
+        editor.commit();
+
+        Log.d(TAG_KIWIX,
+                "onPause Save currentzimfile to preferences:" + ZimContentProvider.getZimFile());
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.main, menu);
+        this.menu = menu;
+        if (requestInitAllMenuItems) {
+            initAllMenuItems();
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    public void selectZimFile() {
+        final Intent target = new Intent(getActivity(), ZimFileSelectActivity.class);
+        target.setAction(Intent.ACTION_GET_CONTENT);
+        // The MIME data type filter
+        target.setType("//");
+        // Only return URIs that can be opened with ContentResolver
+        target.addCategory(Intent.CATEGORY_OPENABLE);
+        // Force use of our file selection component.
+        // (Note may make sense to just define a custom intent instead)
+
+        startActivityForResult(target, ZIMFILESELECT_REQUEST_CODE);
+    }
+
+    public void selectSettings() {
+        Intent i = new Intent(getActivity(), KiwixSettings.class);
+        startActivityForResult(i, PREFERENCES_REQUEST_CODE);
+    }
+
+    public void showSearchBar() {
+        showSearchBar(true);
+    }
+
+    private void showSearchBar(Boolean focus) {
+        articleSearchBar.setVisibility(View.VISIBLE);
+
+        if (focus) {
+            articleSearchtextView.requestFocus();
+
+            // Move cursor to end
+            articleSearchtextView.setSelection(articleSearchtextView.getText().length());
+
+            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(
+                    Context.INPUT_METHOD_SERVICE);
+            imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+        }
+    }
+
+    public void handleTabDeleteCross() {
+
+        // The Result of being a developer and not a photoshop artist: Instead of creating red icons for all
+        // densities, we will just use the previously added white cross icon and apply a red filter on it.
+        mTabDeleteCross.getBackground().setColorFilter(Color.RED, PorterDuff.Mode.MULTIPLY);
+        mTabDeleteCross.setVisibility(View.VISIBLE);
+        mTabDeleteCross.startAnimation(AnimationUtils.loadAnimation(getActivity(), android.R.anim.fade_in));
+    }
+
+    public void showWelcome() {
+        webView.loadUrl("file:///android_res/raw/welcome.html");
+    }
+
+    private void showHelp() {
+
+        // Load from resource. Use with base url as else no images can be embedded.
+        // Note that this leads inclusion of welcome page in browser history
+        // This is not perfect, but good enough. (and would be signifcant effort to remove file)
+        webView.loadUrl("file:///android_res/raw/help.html");
+    }
+
+    public boolean openZimFile(File file, boolean clearHistory) {
+        if (file.exists()) {
+            if (ZimContentProvider.setZimFile(file.getAbsolutePath()) != null) {
+
+                getActivity().getActionBar().setSubtitle(ZimContentProvider.getZimFileTitle());
+
+                // Apparently with webView.clearHistory() only history before currently (fully)
+                // loaded page is cleared -> request clear, actual clear done after load.
+                // Probably not working in all corners (e.g. zim file openend
+                // while load in progress, mainpage of new zim file invalid, ...
+                // but should be good enough.
+                // Actually probably redundant if no zim file openend before in session,
+                // but to be on save side don't clear history in such cases.
+                if (clearHistory) {
+                    requestClearHistoryAfterLoad = true;
+                }
+                if (menu != null) {
+                    initAllMenuItems();
+                } else {
+                    // Menu may not be initialized yet. In this case
+                    // signal to menu create to show
+                    requestInitAllMenuItems = true;
+                }
+
+                openMainPage();
+                showSearchBar(false);
+                return true;
+            } else {
+                Toast.makeText(getActivity(), getResources().getString(R.string.error_fileinvalid),
+                        Toast.LENGTH_LONG).show();
+            }
+
+        } else {
+            Toast.makeText(getActivity(), getResources().getString(R.string.error_filenotfound),
+                    Toast.LENGTH_LONG).show();
+        }
+        return false;
+    }
+
+    private void initAllMenuItems() {
+        menu.findItem(R.id.menu_fullscreen).setVisible(true);
+        menu.findItem(R.id.menu_back).setVisible(true);
+        menu.findItem(R.id.menu_forward).setVisible(false);
+        menu.findItem(R.id.menu_home).setVisible(true);
+        menu.findItem(R.id.menu_randomarticle).setVisible(true);
+        menu.findItem(R.id.menu_searchintext).setVisible(true);
+        menu.findItem(R.id.menu_search).setVisible(true);
+        menu.findItem(R.id.menu_add_tab).setVisible(true);
+        menu.findItem(R.id.menu_remove_tab).setVisible(true);
+    }
+
+    public void onKeyDown(int keyCode, KeyEvent event) {
+        if (event.getAction() == KeyEvent.ACTION_DOWN) {
+            switch (keyCode) {
+                case KeyEvent.KEYCODE_BACK:
+                    if (webView.canGoBack()) {
+                        webView.goBack();
+                    } else {
+                        getActivity().finish();
+                    }
+            }
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        webView.saveState(outState);
+        outState.putString(TAG_CURRENTZIMFILE, ZimContentProvider.getZimFile());
+        outState.putString(TAG_CURRENTARTICLE, webView.getUrl());
+
+    }
+
+    private boolean openArticle(String articleUrl) {
+        Log.d(TAG_KIWIX, articleSearchtextView + " onEditorAction. TextView: " + articleSearchtextView
+                .getText() + " articleUrl: " + articleUrl);
+
+        if (articleUrl != null) {
+            // hideSearchBar();
+            webView.loadUrl(Uri.parse(ZimContentProvider.CONTENT_URI
+                    + articleUrl).toString());
+            return true;
+
+        } else {
+            String errorString = String.format(getResources().getString(R.string.error_articlenotfound),
+                    articleSearchtextView.getText().toString());
+            Toast.makeText(getActivity().getWindow().getContext(), errorString, Toast.LENGTH_SHORT).show();
+
+            return true;
+        }
+    }
+
+    private boolean openArticleFromSearch() {
+        Log.d(TAG_KIWIX, "openArticleFromSearch: " + articleSearchtextView.getText());
+        String articleTitle = articleSearchtextView.getText().toString();
+        String articleUrl = ZimContentProvider.getPageUrlFromTitle(articleTitle);
+        return openArticle(articleUrl);
+    }
+
+    public boolean openRandomArticle() {
+        String articleUrl = ZimContentProvider.getRandomArticleUrl();
+        Log.d(TAG_KIWIX, "openRandomArticle: " + articleUrl);
+        return openArticle(articleUrl);
+    }
+
+    public boolean openMainPage() {
+        String articleUrl = ZimContentProvider.getMainPage();
+        return openArticle(articleUrl);
+    }
+
+    public boolean isTablet(Context context) {
+        return (context.getResources().getConfiguration().screenLayout
+                & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
+    }
+
+    public void hideSearchBar() {
+        // Hide searchbar
+        articleSearchBar.setVisibility(View.GONE);
+        // To close softkeyboard
+        webView.requestFocus();
+        // Seems not really be necessary
+        InputMethodManager imm = (InputMethodManager) getActivity()
+                .getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(articleSearchtextView.getWindowToken(), 0);
+    }
+
+    private void ToggleNightMode() {
+
+        try {
+            InputStream stream = getActivity().getAssets().open("invertcode.js");
+            int size = stream.available();
+            byte[] buffer = new byte[size];
+            stream.read(buffer);
+            stream.close();
+            String JSInvert = new String(buffer);
+            webView.loadUrl("javascript:" + JSInvert);
+            nightMode = !nightMode;
+        } catch (IOException e) {
+
+        }
+    }
+
+    public void setDefaultZoom() {
+        DisplayMetrics metrics = new DisplayMetrics();
+        getActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
+
+        // Cleaner than approach used in 1.0 to set CLOSE for tables, MEDIUM for phones.
+        // However, unfortunately at least on Samsung Galaxy Tab 2 density is medium.
+        // Anyway, user can now override so it should be ok.
+        switch (metrics.densityDpi) {
+
+            case DisplayMetrics.DENSITY_HIGH:
+                Log.d(TAG_KIWIX, "setDefaultZoom for Display DENSITY_HIGH-> ZoomDensity.FAR ");
+                webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.FAR);
+                break;
+
+            case DisplayMetrics.DENSITY_MEDIUM:
+                Log.d(TAG_KIWIX, "setDefaultZoom for Display DENSITY_MEDIUM-> ZoomDensity.MEDIUM ");
+                webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
+                break;
+
+            case DisplayMetrics.DENSITY_LOW:
+                Log.d(TAG_KIWIX, "setDefaultZoom for Display DENSITY_LOW-> ZoomDensity.CLOSE ");
+                webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.CLOSE);
+                break;
+
+            default:
+                Log.d(TAG_KIWIX, "setDefaultZoom for Display OTHER -> ZoomDensity.MEDIUM ");
+                webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
+                break;
+        }
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        mFragmentCommunicator = (KiwixMobileActivity) activity;
+        super.onAttach(activity);
+    }
+
+    // Interface through which we will communicate from the Fragment to the Activity
+    public interface FragmentCommunicator {
+
+        public void removeTabAt(int position);
+
+        public void addNewTab(String url);
+
+        public void closeFullScreenMode();
+
+        public int getPositionOfTab();
+    }
+
+    public class AutoCompleteAdapter extends ArrayAdapter<String> implements Filterable {
+
+        private ArrayList<String> mData;
+
+        public AutoCompleteAdapter(Context context, int textViewResourceId) {
+            super(context, textViewResourceId);
+            mData = new ArrayList<String>();
+        }
+
+        @Override
+        public int getCount() {
+            return mData.size();
+        }
+
+        @Override
+        public String getItem(int index) {
+            return mData.get(index);
+        }
+
+        @Override
+        public Filter getFilter() {
+            Filter myFilter = new Filter() {
+                @Override
+                protected FilterResults performFiltering(CharSequence constraint) {
+                    FilterResults filterResults = new FilterResults();
+                    ArrayList<String> data = new ArrayList<String>();
+                    if (constraint != null) {
+                        // A class that queries a web API, parses the data and returns an ArrayList<Style>
+                        try {
+                            String prefix = constraint.toString();
+
+                            ZimContentProvider.searchSuggestions(prefix, 200);
+                            String suggestion;
+
+                            data.clear();
+                            while ((suggestion = ZimContentProvider.getNextSuggestion()) != null) {
+                                data.add(suggestion);
+                            }
+                        } catch (Exception e) {
+                        }
+                        // Now assign the values and count to the FilterResults object
+                        filterResults.values = data;
+                        filterResults.count = data.size();
+                    }
+                    return filterResults;
+                }
+
+                @SuppressWarnings("unchecked")
+                @Override
+                protected void publishResults(CharSequence contraint, FilterResults results) {
+                    if (results != null && results.count > 0) {
+                        notifyDataSetChanged();
+                        mData = (ArrayList<String>) results.values;
+                    } else {
+                        notifyDataSetInvalidated();
+                    }
+                }
+            };
+            return myFilter;
+        }
+    }
+
+    private class MyWebChromeClient extends WebChromeClient {
+
+        public void onProgressChanged(WebView view, int progress) {
+            getActivity().setProgress(progress * 100);
+            if (progress == 100) {
+
+                Log.d(TAG_KIWIX, "Loading article finished.");
+                if (requestClearHistoryAfterLoad) {
+                    Log.d(TAG_KIWIX,
+                            "Loading article finished and requestClearHistoryAfterLoad -> clearHistory");
+                    webView.clearHistory();
+                    requestClearHistoryAfterLoad = false;
+                }
+
+                Log.d(TAG_KIWIX, "Loaded URL: " + webView.getUrl());
+                if (nightMode) {
+                    nightMode = false;
+                    ToggleNightMode();
+                }
+            }
+        }
+    }
+
+    private class MyWebViewClient extends WebViewClient {
+
+
+        @Override
+        public boolean shouldOverrideUrlLoading(WebView view, String url) {
+
+            if (url.startsWith(ZimContentProvider.CONTENT_URI.toString())) {
+                // This is my web site, so do not override; let my WebView load the page
+                return false;
+
+            } else if (url.startsWith("file://")) {
+                // To handle help page (loaded from resources)
+                return true;
+
+            } else if (url.startsWith("javascript:")) {
+                // Allow javascript for HTML functions and code execution (EX: night mode)
+                return true;
+
+            } else if (url.startsWith(ZimContentProvider.UI_URI.toString())) {
+                // To handle links which access user interface (i.p. used in help page)
+                if (url.equals(ZimContentProvider.UI_URI.toString() + "selectzimfile")) {
+                    selectZimFile();
+                } else if (url.equals(ZimContentProvider.UI_URI.toString() + "gotohelp")) {
+                    showHelp();
+                } else {
+                    Log.e(TAG_KIWIX, "UI Url " + url + " not supported.");
+                }
+                return true;
+            }
+            // Otherwise, the link is not for a page on my site, so launch another Activity that handles URLs
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+            startActivity(intent);
+            return true;
+        }
+
+        @Override
+        public void onReceivedError(WebView view, int errorCode, String description,
+                String failingUrl) {
+            String errorString = String
+                    .format(getResources().getString(R.string.error_articleurlnotfound),
+                            failingUrl);
+            // TODO apparently screws up back/forward
+            webView.loadDataWithBaseURL("file://error",
+                    "<html><body>" + errorString + "</body></html>", "text/html", "utf-8",
+                    failingUrl);
+            String title = getResources().getString(R.string.app_name);
+            getActivity().getActionBar().setTitle(title);
+        }
+
+        @Override
+        public void onPageFinished(WebView view, String url) {
+            String title = getResources().getString(R.string.app_name);
+            if (webView.getTitle() != null && !webView.getTitle().isEmpty()) {
+                title = webView.getTitle();
+            }
+
+            if (getActivity().getActionBar().getTabCount() < 2) {
+                getActivity().getActionBar().setTitle(title);
+            }
+
+            if (getActivity().getActionBar().getNavigationMode() == ActionBar.NAVIGATION_MODE_TABS) {
+                getActivity().getActionBar().getSelectedTab().setText(title);
+            }
+
+            //Workaround for #643
+            if (requestWebReloadOnFinished > 0) {
+                requestWebReloadOnFinished = requestWebReloadOnFinished - 1;
+                Log.d(TAG_KIWIX, "Workaround for #643: onPageFinished. Trigger reloading. ("
+                        + requestWebReloadOnFinished + " reloads left to do)");
+                view.reload();
+            }
+        }
+    }
+}
+
diff --git a/src/org/kiwix/kiwixmobile/KiwixWebView.java b/src/org/kiwix/kiwixmobile/KiwixWebView.java
index 9386bce9e..121e6ddff 100644
--- a/src/org/kiwix/kiwixmobile/KiwixWebView.java
+++ b/src/org/kiwix/kiwixmobile/KiwixWebView.java
@@ -2,19 +2,18 @@ package org.kiwix.kiwixmobile;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.webkit.WebView;
 
-/**
- * Created by sakchham on 20/11/13.
- */
 /*
  * Custom version of link{@android.webkit.WebView}
  * to get scroll positions for implimenting the Back to top
  */
-public class KiwixWebView extends WebView
-{
-    OnPageChangeListener changeListener = null;
+public class KiwixWebView extends WebView {
+
+    private OnPageChangeListener mChangeListener;
+
+    private OnLongClickListener mOnLongClickListener;
+
 
     public KiwixWebView(Context context) {
         super(context);
@@ -28,28 +27,44 @@ public class KiwixWebView extends WebView
         super(context, attrs, defStyle);
     }
 
+    @Override
+    public boolean performLongClick() {
+        WebView.HitTestResult result = getHitTestResult();
+
+        if (result.getType() == HitTestResult.SRC_ANCHOR_TYPE) {
+            mOnLongClickListener.onLongClick(result.getExtra());
+            return true;
+        }
+        return super.performLongClick();
+    }
+
     @Override
     protected void onScrollChanged(int l, int t, int oldl, int oldt) {
         super.onScrollChanged(l, t, oldl, oldt);
         int windowHeight = getMeasuredHeight();
-        int pages = getContentHeight()/windowHeight;
-        int page = t/windowHeight;
+        int pages = getContentHeight() / windowHeight;
+        int page = t / windowHeight;
         //alert the listeners
-        if (changeListener != null);
-            changeListener.onPageChanged(page,pages);
+        if (mChangeListener != null) {
+            mChangeListener.onPageChanged(page, pages);
+        }
+    }
+
+    public void setOnPageChangedListener(OnPageChangeListener listener) {
+        mChangeListener = listener;
+    }
+
+    public void setOnLongClickListener(OnLongClickListener listener) {
+        mOnLongClickListener = listener;
     }
 
     public interface OnPageChangeListener {
-        public void onPageChanged(int page,int maxPages);
+
+        public void onPageChanged(int page, int maxPages);
     }
 
-    /*
-     * We wouldn't be needing more than one so doesn't matter if it wont work for more
-     * than one.
-     */
-    public void registerOnPageChangedListener(OnPageChangeListener listener)
-    {
-        changeListener = listener;
-    }
+    public interface OnLongClickListener {
 
+        public void onLongClick(String url);
+    }
 }
diff --git a/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java b/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java
index 8319437fc..0bf849be1 100644
--- a/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java
+++ b/src/org/kiwix/kiwixmobile/ZimFileSelectActivity.java
@@ -7,12 +7,9 @@ import android.content.Intent;
 import android.content.Loader;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
 import android.widget.Adapter;
@@ -39,9 +36,11 @@ LoaderManager.LoaderCallbacks<Cursor> {
 		setProgressBarIndeterminateVisibility(true);
 		setContentView(R.layout.zimfilelist);
 		selectZimFile();
+
+
 	}
 
-    private void finishResult(String path) {
+	private void finishResult(String path) {
 		if (path != null) {
 			File file = new File(path);
 			Uri uri = Uri.fromFile(file);