diff --git a/.gitignore b/.gitignore
index 7082f54..cccf07a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 *~
 .desktop
 _site/
 .sass-cache/
 .jekyll-cache/
 .jekyll-metadata
+vendor/
+Gemfile.lock
+.bundle/
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..0327bf5
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+ruby RUBY_VERSION
+
+gem "jekyll", "~> 3.8"
+gem "jekyll-kde-theme"
+gem "jekyll-feed"
+
+# If you have any plugins, put them here!
+# group :jekyll_plugins do
+#   gem "jekyll-github-metadata", "~> 1.0"
+# end
diff --git a/_config.yml b/_config.yml
index 4d71917..a9d25ef 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,38 +1,40 @@
 # Welcome to Jekyll!
 #
 # This config file is meant for settings that affect your whole blog, values
 # which you are expected to set up once and rarely edit after that. If you find
 # yourself editing this file very often, consider using Jekyll's data files
 # feature for the data you need to update frequently.
 #
 # For technical reasons, this file is *NOT* reloaded automatically when you use
 # 'bundle exec jekyll serve'. If you change this file, please restart the server process.
 
 # Site settings
 # These are used to personalize your new site. If you look in the HTML files,
 # you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
 title: KDE Microblog client
 email: choqok@kde.org
 url: https://choqok.kde.org
 twitter_username: choqok
 github_username: kde
 
 # Build settings
 markdown: kramdown
-theme: minima
+theme: jekyll-kde-theme
 plugins:
   - jekyll-feed
+sass:
+  style: compressed
 
 # Exclude from processing.
 # The following items will not be processed, by default. Create a custom list
 # to override the default setting.
 # exclude:
 #   - Gemfile
 #   - Gemfile.lock
 #   - node_modules
 #   - vendor/bundle/
 #   - vendor/cache/
 #   - vendor/gems/
 #   - vendor/ruby/
diff --git a/about.md b/about.md
index 5e761b4..f967cb8 100644
--- a/about.md
+++ b/about.md
@@ -1,21 +1,23 @@
 ---
 title: About
 date: 2009-01-19T14:58:03+00:00
 author: Mehrdad
 layout: page
 ---
-Choqok is a [Free](http://www.gnu.org/philosophy/free-sw.html)/[OpenSource](http://www.opensource.org/docs/definition.php), fast, efficient and simple to use micro-blogging client.
+Choqok is a [Free](https://www.gnu.org/philosophy/free-sw.html)/[OpenSource](https://www.opensource.org/docs/definition.php), fast, efficient and simple to use micro-blogging client.
 
 The name comes from an ancient Persian word, means Sparrow!
 
 Currently support Twitter and StatusNet, Pump.io and Open Collaboration micro-blogging services.
 
-**License:** GPLv3
+## License:
 
-<pre><em>Use <a href="http://bugs.kde.org/">KDE Bug tracking system</a> to report bugs or request for new features.
+This project is released under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html).
+
+<pre><em>Use <a href="https://bugs.kde.org/enter_bug.cgi?product=choqok">KDE Bug tracking system</a> to report bugs or request for new features.
 </em></pre>
 
-#### Contact Us:
+## Contact Us:
 
   * We have [a development mailing list](https://mail.kde.org/mailman/listinfo/choqok-devel), you can send emails to.
-  * Our IRC channel in Freenode network: #choqok
\ No newline at end of file
+  * Our IRC channel in Freenode network: #choqok
diff --git a/assets/img/app_icon.png b/assets/img/app_icon.png
new file mode 100644
index 0000000..ddae827
Binary files /dev/null and b/assets/img/app_icon.png differ
diff --git a/css/main.scss b/css/main.scss
new file mode 100644
index 0000000..7bb6f20
--- /dev/null
+++ b/css/main.scss
@@ -0,0 +1,15 @@
+---
+# Only the main Sass file needs front matter (the dashes are enough)
+---
+
+@charset "utf-8";
+
+#kHeaderNav a.nav-link, #kHeaderNav a.dropdown-item {
+    padding: 0 10px !important;
+}
+
+@import "base.scss";
+@import "social.scss";
+@import "glyphs.scss";
+@import "download.scss";
+@import "home.scss";
diff --git a/development.md b/development.md
index 330219a..c5fcf6e 100644
--- a/development.md
+++ b/development.md
@@ -1,36 +1,31 @@
 ---
 title: Development
 date: 2009-03-27T09:41:40+00:00
 author: Mehrdad
 layout: page
 ---
 Choqok is part of [KDE](http://kde.org) project, and source code is at [KDE official git repository](https://projects.kde.org/projects/extragear/network/choqok/repository "Web access to repository").
 
 It&#8217;s always under development and there are many features to add&#8230;
 
 You can help its development via:
 
   * [coding](https://mail.kde.org/mailman/listinfo/choqok-devel)
   * [reporting bugs](http://bugs.kde.org/)
   * [helping translation teams](http://l10n.kde.org/teams-list.php).
   * [making a donation](http://choqok.gnufolks.org/about/contribute/)
 
-### Help With Coding:
+## Help With Coding:
 
 You can join [Choqok development mail list](https://mail.kde.org/mailman/listinfo/choqok-devel) to have a discussion on development or other stuff with Choqok developers or people interested in its development.
 
 _And some useful information about how to write an special Plugin for Choqok is available at [gitorious wiki pages](http://gitorious.org/choqok/pages/Home)._
 
-Choqok&#8217;s source code is hosted at KDE git repository, to have commit/push access you need to have a kde git account. [Check this](http://techbase.kde.org/Contribute) for more information.
+Choqok&#8217;s source code is hosted at KDE git repository, to have commit/push access you need to have a kde git account. [Check this](https://community.kde.org/Get_Involved) for more information.
 
 **If you have any patches, please use [KDE Review Board](http://reviewboard.kde.org/),** and assign it to [me](http://reviewboard.kde.org/users/momeny/).
 
 <p style="padding-left: 30px;">
-  <em>For coding, I recommend <a href="http://techbase.kde.org/Policies/Kdelibs_Coding_Style">kdelibs coding style</a> for Choqok. Nobody is forced to use it. but to have consistent formatting of the source code files it is recommended to make use of it.</em>
+  <em>For coding, I recommend <a href="https://community.kde.org/Policies/Kdelibs_Coding_Style">kdelibs coding style</a> for Choqok. Nobody is forced to use it. but to have consistent formatting of the source code files it is recommended to make use of it.</em>
 </p>
 
-<p style="padding-left: 30px;">
-  <em><br /> </em>
-</p>
-
-&nbsp;
\ No newline at end of file
diff --git a/download.md b/download.md
index f9c9a6a..3460dce 100644
--- a/download.md
+++ b/download.md
@@ -1,44 +1,45 @@
 ---
 title: Download
 date: 2009-01-19T15:51:49+00:00
 author: Mehrdad
 layout: page
 ---
-### Latest Release: Choqok 1.6
+## Latest Release: Choqok 1.6
 
   * **Source code:** [choqok-1.6.tar.bz2](http://download.kde.org/stable/choqok/1.6/src/choqok-1.6.0.tar.xz)
   * **Binary Packages**(Community maintained) : 
       * [ArchLinux](http://www.archlinux.org/packages/?repo=Community&q=choqok)
       * [Kubuntu PPA](https://launchpad.net/~adilson/+archive/experimental)
       * [Gentoo](http://packages.gentoo.org/package/net-im/choqok)
       * Slackware: [SlackBuild](https://github.com/denydias/slackbuilds/tree/master/choqok), [64bit Package](https://github.com/denydias/slackbuilds/blob/master/pkg64/choqok-1.5-x86_64-1deny.tgz?raw=true)
 
-<p style="text-align: center;">
+<p class="text-center">
   ***
 </p>
 
-### Latest development snapshot:
+## Latest development snapshot:
 
 To get latest development snapshot use this:
 
-**$ git clone git://anongit.kde.org/choqok**
+```bash
+$ git clone git://anongit.kde.org/choqok
+```
 
-And if you already cloned the repository:**
-  
-** 
+And if you already cloned the repository:
 
-**$ git pull origin
-  
-** 
+
+```bash
+$ git pull origin
+```
 
 Please take a look at README file, for build instruction.
 
 ### Requirements to build:
 
 CMake 2.6
   
 <span class="caps">KDE 4</span> library Development packages! (On (K)Ubuntu is [kdelibs5-dev](http://packages.ubuntu.com/search?suite=default&section=all&arch=any&searchon=names&keywords=kdelibs5-dev))
   
 you need GNU GetText to compile source packages. (If you haven&#8217;t it, just remove _po_ directory)
 
-[QJSon](http://qjson.sourceforge.net/) Library and [QOAuth](http://qt-apps.org/content/show.php/QOAuth?content=107420) library(>=1.0.1) is needed too!
\ No newline at end of file
+[QJSon](http://qjson.sourceforge.net/) Library and [QOAuth](http://qt-apps.org/content/show.php/QOAuth?content=107420) library(>=1.0.1) is needed too!
diff --git a/index.md b/index.md
index 3d7d9fe..860b111 100644
--- a/index.md
+++ b/index.md
@@ -1,41 +1,40 @@
 ---
-title: Home
 date: 2010-07-11T16:46:59+00:00
 author: Mehrdad
 layout: page
 ---
-Choqok ( pronounced: tʃœˈʁʊk ) is a [Free](http://en.wikipedia.org/wiki/Free_software)/[Open Source](http://en.wikipedia.org/wiki/Open_source_software) micro-blogging client for [K Desktop Environment](http://kde.org).
+Choqok ( pronounced: tʃœˈʁʊk ) is a [Free](http://en.wikipedia.org/wiki/Free_software)/[Open Source](http://en.wikipedia.org/wiki/Open_source_software) micro-blogging client by the [KDE community](http://kde.org).
 
 The name comes from an ancient Persian word, means Sparrow!
 
 Currently supports [Twitter.com](http://twitter.com/), [Pump.io (Formerly known as Identi.ca)](http://identi.ca/), and [OpenDesktop.org](http://opendesktop.org) services.
 
 [<img src="https://i0.wp.com/choqok.gnufolks.org/uploads/choqok.png?w=250" alt="" align="right" border="0" data-recalc-dims="1" />](https://i0.wp.com/choqok.gnufolks.org/uploads/choqok.png)
 
 ### It currently features:
 
   * Supporting Twitter.com micro-blogging service.
   * Supporting Identi.ca micro-blogging service. (pump.io)
   * Supporting self hosted [Gnu Social (Formerly known as StatusNet)](http://www.gnu.org/software/social/) websites. (Using their Twitter compatible API)
   * Supporting Open Collaboration Services API (Used by opendesktop.org)
   * Supporting Friends, @Reply, Favorite and Public time-lines.
   * Support for send and receive direct messages.
   * Official Repeat/ReTweet functions.
   * Supporting Multiple Accounts simultaneously.
   * Supporting search APIs for Twitter and StatusNet services.
   * Support for Twitter lists.
   * KWallet integration.
   * Ability to make a quick tweet/dent with global shortcuts. (Ctrl+Meta+T)
   * Ability to notify user about new statuses arriving.
   * Flickr, ImageShack, Twitpic, Twitgoo, Mobypicture and Posterous photo uploading
   * Support for shortening urls with more than 30 characters.+shorten on paste, With more than 10 shortening services
   * Posts (Statuses) list appearance configuration.
   * Filtering supported to hide unwanted posts.
   * Setting your last post as your current status message in IM clients (Kopete, Pidgin, Psi, Skype)
   * Preview Images from Twitter, Twitpic, YFrog, img.ly, plixi, Twitgoo, TweetPhoto and etc. services.
   * Preview Videos from YouTube and Vimeo services.
   * Send Now Listening text. (Many of favorite players such as Amarok, Exaile, Banshee, Rhythmbox and VLC supported)
   * Expand short Urls.
   * Proxy support.
 
-### License: [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)
\ No newline at end of file
+### License: [GNU GPL v3](http://www.gnu.org/licenses/gpl.html)