diff --git a/atalk/index.html b/atalk/index.html
index bd7c64b..34a4438 100755
--- a/atalk/index.html
+++ b/atalk/index.html
@@ -4,7 +4,7 @@
 	<title>aTalk.org</title>
 	<meta charset="utf-8">
 	<meta name="author" content="cmeng" >
-	<meta name="description" content="Sublime Stunning free HTML5/CSS3 website template"/>
+	<meta name="description" content="Sublime Stunning free HTML5/CSS3 website template"/>
 	<link rel="icon" type="image/png" href="img/atalk.png">
 	<link rel="stylesheet" type="text/css" href="css/reset.css">
 	<link rel="stylesheet" type="text/css" href="css/fancybox-thumbs.css">
@@ -44,75 +44,75 @@ <h1>aTalk (XMPP/Jabber) Client</h1>
 
 		<div class="shadow">
 			<p align="center">
-          <a href="https://github.com/cmeng-git/atalk-android">
-            <img src="img/logo_atalk.png" alt="atalk" align="inline" width="5%" style="margin:5px 20px 20px 0px"/>
-          </a>
-          <a href="./faq.html">
-            <img src="img/help.png" alt="FAQ" align="inline" width="5%" style="margin:5px 20px 20px 0px"/>
-          </a>
-          <a href="https://f-droid.org/en/packages/org.atalk.android/">
-            <img src="img/fdroid-logo.png" alt="F-Droid" align="inline" width="15%" style="margin:5px 20px 20px 0px"/>
-          </a>
+          <a href="https://github.com/cmeng-git/atalk-android">
+            <img src="img/logo_atalk.png" alt="atalk" align="inline" width="5%" style="margin:5px 20px 20px 0px"/>
+          </a>
+          <a href="./faq.html">
+            <img src="img/help.png" alt="FAQ" align="inline" width="5%" style="margin:5px 20px 20px 0px"/>
+          </a>
+          <a href="https://f-droid.org/en/packages/org.atalk.android/">
+            <img src="img/fdroid-logo.png" alt="F-Droid" align="inline" width="15%" style="margin:5px 20px 20px 0px"/>
+          </a>
 			    <a href="https://play.google.com/store/apps/details?id=org.atalk.android&hl=en">
-            <img src="img/google_play.png" alt="PlayStore" align="inline" width="15%" style="margin:5px 20px 20px 0px"/>
+            <img src="img/google_play.png" alt="PlayStore" align="inline" width="15%" style="margin:5px 20px 20px 0px"/>
 			    </a>
 				  <a href="https://youtu.be/9w5WwphzgBc">
-            <img src="img/youtube.png" alt="YouTube" align="inline" width="5%" style="margin:5px 0px 20px 0px"/>
-				</a>
+            <img src="img/youtube.png" alt="YouTube" align="inline" width="5%" style="margin:5px 0px 20px 0px"/>
+				</a>
 			</p>
 		</div>
-	</section>
+	</section>
 	<!--  End billboard  -->
 
 	<div class="feature dark">
     <h2>Features</h2>
     <h4>aTalk is an xmpp client designed for android and supports the following features:</h4>
     <ul>
-      <li>Instant messaging in plain text and End-to-End encryption with <a href="http://conversations.im/omemo/">OMEMO</a>
-			  or <a href="https://otr.cypherpunks.ca/">OTR</a></li>
-      <li><a href="./faq.html#account_03">SSL Certificate authentication, DNSSEC and DANE Security</a> implementation for enhanced secure Connection Establishment</li>
+      <li>Instant messaging in plain text and End-to-End encryption with <a href="http://conversations.im/omemo/">OMEMO</a>
+			  or <a href="https://otr.cypherpunks.ca/">OTR</a></li>
+      <li><a href="./faq.html#account_03">SSL Certificate authentication, DNSSEC and DANE Security</a> implementation for enhanced secure Connection Establishment</li>
       <li>OMEMO encryption in group chat session enhancing privacy and security</li>
-      <li><a href="https://xmpp.org/extensions/inbox/omemo-media-sharing.html">OMEMO Media File Sharing</a> for all files including Stickers, Bitmoji and Emoji rich contents</li>
-      <li>Support <a href="https://xmpp.org/extensions/xep-0363.html">HTTP File Upload</a> for file sharing with offline contact and in group chat</li>
-      <li>Support <a href="./faq.html#feature_04">Stickers, Bitmoji and Emoji</a> rich content sharing via Google Gboard</li>
+      <li><a href="https://xmpp.org/extensions/xep-0454.html">OMEMO Media File Sharing</a> for all files including Stickers, Bitmoji and Emoji rich contents</li>
+      <li>Support <a href="https://xmpp.org/extensions/xep-0363.html">HTTP File Upload</a> for file sharing with offline contact and in group chat</li>
+      <li>Support <a href="./faq.html#feature_04">Stickers, Bitmoji and Emoji</a> rich content sharing via Google Gboard</li>
       <li>Send and receive files for all document types and images, with thumbnail preview and gif animation</li>
-      <li>Auto accept file transfer request with max file size option</li>
-      <li>Implement <a href="./faq.html#feature_05">fault-tolerance file transfer</a> algorithm, via Jingle File Transfer, Legacy In-Band/SOCK5 Bytestreams and HttpFileUpload protocols to ease and enhance file sharing reliability</li>
+      <li>Auto accept file transfer request with max file size option</li>
+      <li>Implement <a href="./faq.html#feature_05">fault-tolerance file transfer</a> algorithm, via Jingle File Transfer, Legacy In-Band/SOCK5 Bytestreams and HttpFileUpload protocols to ease and enhance file sharing reliability</li>
       <li>Enhance and harmonize UI for file sharing in chat and chatRoom</li>
       <li>Support share, quote and forward of messages and medias with preview prior to sending</li>
       <li>Support multi-instances of audio media player with functions: Play, Pause, Resume, Stop and Seek</li>
-      <li>Support unread message badges in contact and chatRoom list views</li>
+      <li>Support unread message badges in contact and chatRoom list views</li>
       <li>User selectable option for heads-up notification and quite hours</li>
       <li>Share of social media links are tagged with thumbnail and title</li>
-      <li>Support Text to Speech and speech recognition UI with enable option per chat session (contact and group chat)</li>
+      <li>Support Text to Speech and speech recognition UI with enable option per chat session (contact and group chat)</li>
       <li>XEP-0012: Last Activity time associated with contacts</li>
-      <li>XEP-0048: Bookmarks for conference room and autoJoin on login</li>			  
-      <li>XEP-0070: Verifying HTTP Requests via XMPP entity for user authentication without password entry</li>
+      <li>XEP-0048: Bookmarks for conference room and autoJoin on login</li>			  
+      <li>XEP-0070: Verifying HTTP Requests via XMPP entity for user authentication without password entry</li>
       <li>XEP-0071: XHTML-IM Support chat messages containing lightweight text markup</li>
       <li>XEP-0085: Chat State Notifications</li>
       <li>XEP-0124: Bidirectional-streams Over Synchronous HTTP (BOSH) with Proxy support</li>
       <li>XEP-0178: Use of SASL EXTERNAL with TLS Certificates for client authentication</li>
       <li>XEP-0184: Message Delivery Receipts with user enable/disable option</li>
       <li>XEP-0191: Blocking command</li>
-      <li>XEP-0251: Jingle Session Transfer: Support both Unattended and Attended call transfer</li>
-      <li>XEP-0313: Message Archive Management</li>
-      <li>XEP-0391: Jingle Encrypted Transports for OMEMO encrypted media file sharing</li>
+      <li>XEP-0251: Jingle Session Transfer: Support both Unattended and Attended call transfer</li>
+      <li>XEP-0313: Message Archive Management</li>
+      <li>XEP-0391: Jingle Encrypted Transports for OMEMO encrypted media file sharing</li>
       <li>Implement call waiting to accept a second incoming call by placing the in-progress call on hold; and allow switching between calls</li>
-      <li>Implement Jabber VoIP-PBX gateway Telephony, allowing PBX phone call via service gateway</li>
-      <li><a href="./faq.html#feature_03">Multi-user chat</a> Join or create room with full room configuration support for owner</li>
+      <li>Implement Jabber VoIP-PBX gateway Telephony, allowing PBX phone call via service gateway</li>
+      <li><a href="./faq.html#feature_03">Multi-user chat</a> Join or create room with full room configuration support for owner</li>
       <li>Integrated captcha protected room user interface with retry on failure</li>
       <li>Support both voice and video call with <a href="./faq.html#media_05">ZRTP, SDES and DTLS SRTP</a> encryption modes</li>
       <li>ZRTP crypto algorithms uses SHA-2 384, 256bit ciphers AES256 &amp; TWOFISH-256, enabling elliptic with Curve 25519</li>
       <li>SDES encryption with AES256 and AES192, acceleration using OpenSSL</li>
-      <li>Support <a href="./faq.html#media_02">simultaneous media call and message chat sessions</a></li>
-      <li>Unique <a href="./faq.html#feature_02">GPS-Location</a> implementation; Unique GPS-Location implementation as standalone tool, send locations to your desired buddy for real-time tracking or playback animation</li>
+      <li>Support <a href="./faq.html#media_02">simultaneous media call and message chat sessions</a></li>
+      <li>Unique <a href="./faq.html#feature_02">GPS-Location</a> implementation; Unique GPS-Location implementation as standalone tool, send locations to your desired buddy for real-time tracking or playback animation</li>
       <li>A 360° street view of your current location use for self-guided tour. The street view tracks and follows your direction of sight.</li>
       <li>Built-in demo for GPS-Location features</li>
       <li>Integrated photo editor with zooming and cropping, user can update the avatar with ease</li>
       <li>Last message correction, message carbons and offline messages (OMEMO)</li>
-      <li><a href="./faq.html#feature_06">Stream Management</a> and mobile network ping interval self-tune optimization support</li>
-      <li><a href="./faq.html#account_04">In-Band Registration</a> with Captcha option support</li>
-      <li>Multiple accounts creation</li>
+      <li><a href="./faq.html#feature_06">Stream Management</a> and mobile network ping interval self-tune optimization support</li>
+      <li><a href="./faq.html#account_04">In-Band Registration</a> with Captcha option support</li>
+      <li>Multiple accounts creation</li>
       <li>User selectable Themes support</li>
       <li>Multi-language UI support (Bahasa Indonesia, English, German, Portuguese, Russian, Slovak and Spanish)</li>
       <li><a href="./faq.html">Online help support</a></li>
@@ -246,11 +246,11 @@ <h2>IBR Registration</h2>
 							<source src="./video/11.atalk_ibr.mp4" type="video/mp4">
 							Your browser does not support the video tag.
 						</video>
-						<p>Add new user account with IBR registration enabled. Most xmpp server has 30s connection timeout
+						<p>Add new user account with IBR registration enabled. Most xmpp server has 30s connection timeout
 						   in IBR registration.</p>
 					</div>
 				</li>
-
+
 				<li class="animated wow fadeInDown" data-wow-delay="0.9s">
 					<h2>Telephony</h2>
 					<div class="media">