diff --git a/.gitignore b/.gitignore
index 2ca86829..441b94db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ _site/
 .sass-cache/
 .jekyll-cache/
 .jekyll-metadata
+.env
+.env*
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 45157c68..850a06ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,5 +22,6 @@ group :jekyll_plugins do
     gem 'jekyll-gzip'
     gem 'jekyll-redirect-from'
     gem 'jekyll-extlinks'
+    gem "jekyll-github-metadata"
 end
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 3fa09ad7..3fd2f44c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,6 +42,9 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
+    jekyll-github-metadata (2.13.0)
+      jekyll (>= 3.4, < 5.0)
+      octokit (~> 4.0, != 4.4.0)
     jekyll-gzip (2.4.2)
       jekyll (>= 3.0, < 5.0)
     jekyll-loading-lazy (0.1.1)
@@ -112,6 +115,7 @@ DEPENDENCIES
   jekyll-extlinks
   jekyll-feed
   jekyll-gist
+  jekyll-github-metadata
   jekyll-gzip
   jekyll-loading-lazy
   jekyll-paginate
diff --git a/_config.yml b/_config.yml
index 9438f369..5888d20c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,24 +10,35 @@ paginate: 12
 paginate_path: "/blog/page:num/"
 permalink: /blog/:year/:month/:day/:title
 timezone: 'Asia/Hong_Kong'
-isSubdirectory: 
 baseurl: ''
 email: ''
 google_analytics: ''
 gtm: '' # Google Tag Manager ID
 adsense: '' # Google Adsense ID
 disqus: ''
-disqus-amp-baseurl: 'https://' #baseurl of your AMP disqus iframe element
+disqus_amp_baseurl: 'https://' #baseurl of your AMP disqus iframe element
 addthis: 
 cse_id: # Google Custom Search Engine ID
 buyme:
+sidebar:
+  featured: true
+  recent_posts: true
+repository: chriskyfung/amp-affiliately-jekyll-theme #<USERNAME>/<PROJECT>
 
 # Authors
 authors:
-  chris:
-    name: Chris
-    display_name: Chris
-    gravatar: abd876486b2caa54b43bf64a5a86f620
+  John:
+    name: John Washer
+    display_name: John
+    gravatar: 
+    email: 
+    web: 
+    facebook: https://www.facebook.com/
+    description: 
+  Peter:
+    name: Peter Mu
+    display_name: Peter
+    gravatar: 
     email: 
     web: 
     facebook: https://www.facebook.com/
@@ -45,6 +56,7 @@ plugins:
   - jekyll-gzip
   - jekyll-redirect-from
   - jekyll-extlinks
+  - jekyll-github-metadata
         
 # Archives
 jekyll-archives:
diff --git a/_includes/disqus.html b/_includes/disqus.html
index 2a20baf9..098ed3dd 100644
--- a/_includes/disqus.html
+++ b/_includes/disqus.html
@@ -2,7 +2,7 @@
     <amp-iframe width=600 height=140 layout="responsive"
     sandbox="allow-scripts allow-same-origin allow-modals allow-popups allow-forms"
     resizable
-    src="https://{{ site.disqus-amp-baseurl }}/disqus-amp/q.html?url={{ site.url }}{{ page.url }}&title='{{ page.title }}'"
+    src="https://{{ site.disqus_amp_baseurl }}/disqus-amp/q.html?url={{ site.url }}{{ page.url }}&title='{{ page.title }}'"
     >
         <div overflow
         tabindex=0
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 35d1d59d..a9b04b0a 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -1,114 +1,128 @@
-<!--
-Template Name:Affiliates
-Copyright:WowThemes.net,https://www.wowthemes.net
-Version:1.0.2
-License: https://www.wowthemes.net/freebies-license/
--->
-
 <aside class="sidebar">
+        
+    {% if page.download %}
+        <div aria-label="download links" class="sidebar-section">
+            <h5><span>Resources</span></h5>
+            {% if site.github.repository_url %}
+            <a class="btn btn-primary btn-lg col-12 mb-3" href="{{ site.github.repository_url }}" rel="noopener noreferrer">View on GitHub <i class='fab fa-github'></i></a>
+            {% endif %}
+            {% if page.download.url %}
+            <a class="btn btn-primary btn-lg col-12 mb-3" href="{{ page.download.url }}" rel="noopener noreferrer">Download <i class='fas fa-cloud-download-alt'></i></a>
+            {% elsif site.github.latest_release %}
+            <a class="btn btn-primary btn-lg col-12 mb-3" href="{{ site.github.latest_release.html_url }}" rel="noopener noreferrer">Latest Release</a>
+            <div style="display:flex;flex-wrap: wrap;justify-content: space-between;">
+                <div><i class='fas fa-tag'></i> {{ site.github.latest_release.tag_name }}</div>
+                <div><i class='fas fa-clock'></i> <time datetime="{{ site.github.latest_release.published_at }}">{{ site.github.latest_release.published_at | date: "%b %d, %Y" }}</time></div>
+                {% endif %}
+                {% if site.github.license %}
+                <div><i class='fas fa-balance-scale'></i> {{ site.github.license.name }}</div>
+                {% endif %}
+            </div>
+        </div>
+    {% endif %}
 
-        {% unless page.url == "/blog/" or page.url contains "/blog/page" or site.isSubdirectory %}
-            <!-- Featured -->
-            <div aria-label="featured posts" class="sidebar-section">
-                <h5><span>Featured</span></h5>
-                
-                <section class="featured-posts">
+    {% unless site.sidebar.recent_posts == false or page.url == "/blog/" or page.url contains "/blog/page" %}
+        <!-- Featured -->
+        <div aria-label="featured posts" class="sidebar-section">
+            <h5><span>Featured</span></h5>
+            
+            <section class="featured-posts">
 
-                    <div class="row listfeaturedtag">
+                <div class="row listfeaturedtag">
 
-                    {% for post in site.posts %}
+                {% for post in site.posts %}
 
-                        {% if post.featured == true %}
+                    {% if post.featured == true %}
 
-                            {% include featuredlist.html %}
+                        {% include featuredlist.html %}
 
-                        {% endif %}
+                    {% endif %}
 
-                    {% endfor %}
+                {% endfor %}
 
-                    </div>
+                </div>
 
-                </section>
-            </div>
-        {% endunless %}
+            </section>
+        </div>
+    {% endunless %}
 
-        {% unless page.url == "/" or page.url == "/blog/" or page.url contains "/blog/page"%}
-            <!-- Recent Posts -->
-            <div aria-label="recent posts" class="sidebar-section">
-                <h5><span>Recent Posts</span></h5>
-                
-                <section class="recent-posts">
+    {% unless page.url == "/" or page.url == "/blog/" or page.url contains "/blog/page"%}
+        <!-- Recent Posts -->
+        <div aria-label="recent posts" class="sidebar-section">
+            <h5><span>Recent Posts</span></h5>
+            
+            <section class="recent-posts">
 
-                    <div class="row listfeaturedtag">
+                <div class="row listfeaturedtag">
 
-                    {% for post in site.posts limit:4 %}
+                {% for post in site.posts limit:4 %}
 
-                            {% include featuredlist.html %}
+                        {% include featuredlist.html %}
 
-                    {% endfor %}
+                {% endfor %}
 
-                    </div>
+                </div>
 
-                </section>
-            </div>
-        {% endunless %}
-            
-        <div aria-label="useful links" class="sidebar-section">
-            <h5><span>Useful</span></h5>
-            <ul style="list-style:list-none">
-            <li><a href="{{ site.baseurl }}/tag/qwiklabs">Qwiklabs Logbooks & Tools</a></li>
-            <li><a href="{{ site.baseurl }}/tag/tumblr">For Tumblr Developer</a></li>
-            <li><a href="{{ site.baseurl }}/tag/matlab">MATLAB Tips</a></li>
-            <li><a href="{{ site.baseurl }}/tag/evernote/">Evernote Tips</a></li>
-            <li><a href="{{ site.baseurl }}/contact">Partner with Me</a></li>
-            <li><a href="https://invitation.codes/@chriskyfung" data-type="badge1" target="_blank" rel="noopener noreferrer">Use my referral codes</a></li>
-            </ul>
-        </div>
-
-        <!-- {% unless page.url == "/" or page.url == "/blog/" or page.url contains "/blog/page"%}
-        <div class="sidebar-section">
-            <h5><span>Recommended for You</span></h5>
-            <div class="addthis_relatedposts_inline"></div>
-        </div>
-        {% endunless %} -->
-
-        <div aria-label="youtube" class="sidebar-section">
-            <h5><span><i class='fab fa-youtube' style="color:red"></i> YouTube</span></h5>
-            <h6><span>Featured Video 📹</span></h6>
-            <ul style="list-style:list-none">
-                <li>{% include youtube-thumb.html id="5UrQ9D-epG8" title='GSP315 Perform Foundational Infrastructure Tasks in Google Cloud: Challenge Lab' %}</li>
-            </ul>
-            <amp-iframe
-                width="240"
-                height="100"
-                sandbox="allow-scripts allow-same-origin"
-                layout="intrinsic"
-                frameborder="0"
-                src="https://chriskyfung.gitlab.io/youtube_subscribe_button/youtube_subscribe_button.html"
-                >
-                <div fallback>Fail to load script</div>
-            </amp-iframe>
-        </div>
-            
-        <div aria-label="sidbar-ads" class="sidebar-section">
-            <h5><span>Ads</span></h5>
-            {% include sidebar-adsense.html %}
-        </div>
-
-        <div aria-label="craftweeks" class="sidebar-section">
-            <h5><span>Related Sites</span></h5>
-            <a href="https://craftweeks.com/en/" target="_blank">
-                {% include picture.html img="craftweeks-logo-with-black-title-transparent-bg-200x67.png" width="200" height="67" alt="Craftweeks logo" source="assets" lightbox=false %}
-            </a>
-            <h6><span>Recommended 📬</span></h6>
-            <ul style="list-style:list-none">
-                <li>
-                    <a href="https://craftweeks.com/en/tag/postman/" target="_blank">
-                        {% include picture.html img="postman-tutorials-disqus-rest-api.thumb.jpg" width="267" height="150" alt="Postman Tutorials: Case Study of Disqus REST API" source="assets" %}
-                        <b>Postman Tutorials: Case Study of Disqus API</b>
-                    </a>
-                </li>
-            </ul>
+            </section>
         </div>
+    {% endunless %}
+        
+    <div aria-label="useful links" class="sidebar-section">
+        <h5><span>Useful</span></h5>
+        <ul style="list-style:list-none">
+        <li><a href="{{ site.baseurl }}/tag/qwiklabs">Qwiklabs Logbooks & Tools</a></li>
+        <li><a href="{{ site.baseurl }}/tag/tumblr">For Tumblr Developer</a></li>
+        <li><a href="{{ site.baseurl }}/tag/matlab">MATLAB Tips</a></li>
+        <li><a href="{{ site.baseurl }}/tag/evernote/">Evernote Tips</a></li>
+        <li><a href="{{ site.baseurl }}/contact">Partner with Me</a></li>
+        <li><a href="https://invitation.codes/@chriskyfung" data-type="badge1" target="_blank" rel="noopener noreferrer">Use my referral codes</a></li>
+        </ul>
+    </div>
+
+    <!-- {% unless page.url == "/" or page.url == "/blog/" or page.url contains "/blog/page"%}
+    <div class="sidebar-section">
+        <h5><span>Recommended for You</span></h5>
+        <div class="addthis_relatedposts_inline"></div>
+    </div>
+    {% endunless %} -->
+
+    <div aria-label="youtube" class="sidebar-section">
+        <h5><span><i class='fab fa-youtube' style="color:red"></i> YouTube</span></h5>
+        <h6><span>Featured Video 📹</span></h6>
+        <ul style="list-style:list-none">
+            <li>{% include youtube-thumb.html id="5UrQ9D-epG8" title='GSP315 Perform Foundational Infrastructure Tasks in Google Cloud: Challenge Lab' %}</li>
+        </ul>
+        <amp-iframe
+            width="240"
+            height="100"
+            sandbox="allow-scripts allow-same-origin"
+            layout="intrinsic"
+            frameborder="0"
+            src="https://chriskyfung.gitlab.io/youtube_subscribe_button/youtube_subscribe_button.html"
+            >
+            <div fallback>Fail to load script</div>
+        </amp-iframe>
+    </div>
+        
+    <div aria-label="sidbar-ads" class="sidebar-section">
+        <h5><span>Ads</span></h5>
+        {% include sidebar-adsense.html %}
+    </div>
+
+    <div aria-label="craftweeks" class="sidebar-section">
+        <h5><span>Related Sites</span></h5>
+        <a href="https://craftweeks.com/en/" target="_blank">
+            {% include picture.html img="craftweeks-logo-with-black-title-transparent-bg-200x67.png" width="200" height="67" alt="Craftweeks logo" source="assets" lightbox=false %}
+        </a>
+        <h6><span>Recommended 📬</span></h6>
+        <ul style="list-style:list-none">
+            <li>
+                <a href="https://craftweeks.com/en/tag/postman/" target="_blank">
+                    {% include picture.html img="postman-tutorials-disqus-rest-api.thumb.jpg" width="267" height="150" alt="Postman Tutorials: Case Study of Disqus REST API" source="assets" %}
+                    <b>Postman Tutorials: Case Study of Disqus API</b>
+                </a>
+            </li>
+        </ul>
+    </div>
         
 </aside>
\ No newline at end of file
diff --git a/_posts/2017-11-27-media.md b/_posts/2017-11-27-media.md
index 856a7881..85c3ec6e 100644
--- a/_posts/2017-11-27-media.md
+++ b/_posts/2017-11-27-media.md
@@ -2,7 +2,9 @@
 layout: post
 title: Media
 date: 2017-11-27 04:00:00
-tags: media test
+author: Peter
+category: test
+tags: media
 amp:
   youtube: true
 meta: >-
diff --git a/_posts/2017-11-28-code.md b/_posts/2017-11-28-code.md
index adab5f71..cd906054 100644
--- a/_posts/2017-11-28-code.md
+++ b/_posts/2017-11-28-code.md
@@ -2,11 +2,14 @@
 layout: post
 title: Code
 date: 2017-11-28 04:00:00
+author: John
+category: test
 tags: code
 css:
   syntax: true
 meta: >-
   <meta name="robots" content="noindex">
+download: true
 ---
 
 <p>Code can be presented inline, like <code>&lt;?php bloginfo('stylesheet_url'); ?&gt;</code>, or within a <code>``` ```</code> block.</p>
diff --git a/_posts/2017-11-29-sample.md b/_posts/2017-11-29-sample.md
index 5cccb55f..58ed7007 100644
--- a/_posts/2017-11-29-sample.md
+++ b/_posts/2017-11-29-sample.md
@@ -4,7 +4,8 @@ image:
     path: /assets/images/tree.jpg
 title: Sample
 date: 2017-11-29 04:00:00
-tags: test
+author: Peter
+category: test
 meta: >-
   <meta name="robots" content="noindex">
 ---
diff --git a/_posts/2017-11-30-style-guide.md b/_posts/2017-11-30-style-guide.md
index b94c7d26..744fa127 100644
--- a/_posts/2017-11-30-style-guide.md
+++ b/_posts/2017-11-30-style-guide.md
@@ -4,11 +4,13 @@ image:
   path: /assets/images/shiva.jpg
 title: Style Guide
 date: 2017-11-30 04:00:00
-tags: guide
+author: Peter
+category: guide
+featured: true
 css:
   syntax: true
 meta: >-
-  <meta name="robots" content="noindex">  
+  <meta name="robots" content="noindex">
 ---
 
 <p>This shows how you can use html styling to achieve your hopes.</p>
diff --git a/index.html b/index.html
index a479f52e..a1163a9d 100644
--- a/index.html
+++ b/index.html
@@ -4,59 +4,65 @@
   enabled: true
 ---
 
-<main id="content" role="main" class="content">
-
-  <div class="cf frame">
-    {% for post in paginator.posts %}
-      <article class="post" itemscope itemtype="http://schema.org/BlogPosting" role="article">
-        <div class="article-item">
-          <header class="post-header">
-            <h2 class="post-title" itemprop="name"><a href="{{ site.baseurl }}{{ post.url }}" itemprop="url">{{ post.title }}</a></h2>
-          </header>
-          <section class="post-excerpt" itemprop="description">
-            <p class="post-description">{{ post.excerpt | strip_html | truncatewords: 50 }}</p>
-          </section>
-          <div class="post-meta">
-            {% for author in site.data.authors %}
-              {% if author[1].username == post.author %}
-                {% if author[1].assets %}<amp-img width="24" height="24" class="author-thumb" layout="responsive" src="{{ site.baseurl }}{{author[1].assets}}" alt="{{author[1].name}}"/></amp-img>{% endif %}
-                <a href="{{site.baseurl}}authors/#{{author[1].username}}">{{author[1].name}}</a>
-              {% endif %}
-            {% endfor %}
-
-            {% if post.tags.size > 0 %}
-                in
-                {% for tag in post.tags %}
-                    {% if forloop.index == post.tags.size %}
-                       <a href='{{site.baseurl}}tags/#{{tag}}'>{{ tag | capitalize }}</a>
-                    {% else %}
-                       <a href='{{site.baseurl}}tags/#{{tag}}'>{{ tag | capitalize }}</a>,
-                    {% endif %}
-                {% endfor %}
-            {% endif %}
-              <time class="post-date" datetime="{{ post.date | date:'%Y-%m-%d' }}">{{ post.date | date_to_string }}</time>
-          </div>
-        </div>
-      </article>
-    {% endfor %}
-  </div>
-
-  <nav class="pagination" role="navigation">
-    {% if paginator.next_page %}
-      <a class="newer-posts" href="{{ site.baseurl }}/page{{paginator.next_page}}">&larr; Older posts</a>
-    {% else %}
-      <a class="newer-posts disabled">&larr; Older posts</a>
-    {% endif %}
-    <span class="page-number">Page {{ paginator.page }} of {{ paginator.total_pages }}</span>
-    {% if paginator.previous_page %}
-      {% if paginator.page == 2 %}
-        <a class="older-posts" href="{{ site.baseurl }}/">Newer posts &rarr;</a>
-      {% else %}
-        <a class="older-posts" href="{{ site.baseurl }}/page{{paginator.previous_page}}">Newer posts &rarr;</a>
+<!-- Featured
+  ================================================== -->
+  <section class="featured-posts">
+    
+    <div class="section-title">
+      <h2><span>Featured</span></h2>
+    </div>
+    
+    <div class="row listfeaturedtag">
+      
+      {% for post in site.posts limit:4 %}
+      
+      {% if post.featured == true %}
+      
+      {% include featuredbox.html %}
+      
       {% endif %}
-    {% else %}
-      <a class="older-posts disabled">Newer posts &rarr;</a>
+      
+      
+      
+      {% endfor %}
+      
+    </div>
+    
+  </section>
+  
+  <!-- Posts Index
+    ================================================== -->
+    {% if paginator.previous_page %}
+    {% if paginator.previous_page > 0 %}
+    <div id="jumptopageof"></div>
     {% endif %}
-  </nav>
-
-</main>
+    {% endif %}    
+    
+    <section class="recent-posts row">
+      
+      <div class="section-title">
+        <h2><span>All Stories</span></h2>    
+      </div>
+      
+      <div class="masonrygrid row listrecent">
+        
+        {% for post in paginator.posts %}
+        
+        {% include postbox.html %}
+        
+        {% endfor %}
+        
+      </div> 
+      
+      <!-- Pagination -->
+      <div class="bottompagination">
+        
+        <span class="navigation" role="navigation">
+          
+          {% include pagination.html %}
+          
+        </span>
+        
+      </div>
+      
+    </section>
\ No newline at end of file