diff --git a/.gitignore b/.gitignore
index 496ee2c..bf9dfdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.DS_Store
\ No newline at end of file
+*.swp
+.DS_Store
diff --git a/README.md b/README.md
index e26c33a..8a071b7 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,13 @@ fancybox: true
 
 google_analytics:
 rss:
+
+comment_provider: facebook
+facebook:
+  appid: 012345012345
+  comment_count: 5
+  comment_width: 840
+  comment_colorscheme: light
 ```
 
 - **menu** - Main navigation menu
@@ -72,12 +79,16 @@ rss:
 - **fancybox** - Enable [Fancybox]
 - **google_analytics** - Google Analytics ID
 - **rss** - RSS subscription link (change if using Feedburner)
-
+- **comment_provider** - "facebook" (to enable Facebook comments)
+  - **appid** - Facebook AppId (from developer tools)
+  - **comment_count** - Number of commends to show
+  - **comment_width** - Width of comment box in pixels
+  - **comment_colorscheme** - Color scheme
+ 
 ## Features
 
 ### Gallery Post
 
-![](http://i.minus.com/ibp6Hbytwgof9y.jpg)
 
 ```
 ---
@@ -91,8 +102,6 @@ photos:
 
 ### Link Post
 
-![](http://i.minus.com/i7hBbGqh14EWo.png)
-
 ```
 ---
 layout: link
@@ -103,12 +112,10 @@ link: http://www.google.com/
 
 ### Tweet Widget
 
-![](http://i.minus.com/iMC8EyF9y0Y3y.PNG)
 
 ### Fancybox
 
-![](http://i.minus.com/iHv7h7rZNqHvo.PNG)
 
-[Hexo]: http://zespia.tw/hexo/
+[Hexo]: http://hexo.io
 [AddThis]: https://www.addthis.com
-[Fancybox]: http://fancyapps.com/fancybox/
\ No newline at end of file
+[Fancybox]: http://fancyapps.com/fancybox/
diff --git a/_config.yml b/_config.yml
index 1c8e9cd..10f9c98 100644
--- a/_config.yml
+++ b/_config.yml
@@ -6,6 +6,7 @@ widgets:
 - search
 - category
 - tag
+- twitter
 
 excerpt_link: Read More
 
@@ -27,10 +28,9 @@ fancybox: true
 google_analytics:
 rss:
 
-comment_provider: facebook
-# Facebook comment
+# comment_provider: facebook
 facebook:
-  appid: 123456789012345
+  appid: 012345012345
   comment_count: 5
   comment_width: 840
-  comment_colorscheme: light
\ No newline at end of file
+  comment_colorscheme: light
diff --git a/languages/en.yml b/languages/en.yml
new file mode 100644
index 0000000..f8c87cd
--- /dev/null
+++ b/languages/en.yml
@@ -0,0 +1,12 @@
+categories: Categories
+search: Search
+tags: Tags
+tagcloud: Tag Cloud
+tweets: Tweets
+prev: Prev
+next: Next
+comment: Comments
+archive_a: Archives
+archive_b: "Archives: %s"
+page: Page %d
+recent_posts: Recent Posts
\ No newline at end of file
diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index cd7c84a..07bc786 100644
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -24,7 +24,7 @@
             <a href="<%- config.root %><%- item.path %>#more" class="more-link"><%= theme.excerpt_link %></a>
           </div>
         <% } %>
-        <% if (item.comment && config.disqus_shortname){ %>
+        <% if (item.comments && config.disqus_shortname){ %>
         <div class="alignright">
           <a href="<%- item.permalink %>#disqus_thread" class="comment-link">Comments</a>
         </div>
@@ -39,4 +39,6 @@
   </div>
 </article>
 
+<% if (item.comments && (config.disqus_shortname || theme.comment_provider == "facebook")){ %>
 <%- partial('comment') %>
+<% } %>