diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index f2fd98c..e7c3490 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,8 @@
+## Questions
+
+Please ask your questions at the [gitter channel](https://gitter.im/PanosSakkos/personal-jekyll-theme).
+That way the issues here are kept clean and you will get an answer to your question quicker :smile:
+
 ## Expected Behavior
 
 
diff --git a/.gitignore b/.gitignore
index a9adbc9..aac0add 100755
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ test/
 _deploy/*
 Rakefile
 .jekyll-metadata
+/.idea/
\ No newline at end of file
diff --git a/README.md b/README.md
index 1cfbfcc..6a1da80 100755
--- a/README.md
+++ b/README.md
@@ -46,19 +46,29 @@ You can watch it in action [here](https://panossakkos.github.io/personal-jekyll-
 
 The theme contains documentation in the form of [blog posts](https://panossakkos.github.io/personal-jekyll-theme/blog/index.html).
 
+![iOS](https://dl.dropboxusercontent.com/u/8522559/personal-jekyll-theme/ios.jpg)
+
+![Android](https://dl.dropboxusercontent.com/u/8522559/personal-jekyll-theme/pinned.jpg)
+
 ## How to run locally
 
 First, you need to install jekyll and the dependencies of { Personal } by running:
 
-````
+```shell
 ./scripts/install
-````
+```
 
 Then, you can build and serve your website by simply running:
 
-````
+```shell
 ./scripts/serve-production
-````
+```
+
+To serve across lan (requires su to forward the port 4000 over lan):
+
+```shell
+./scripts/serve-lan-production
+```
 
 ## OSS used in { Personal }
 
diff --git a/_config.yml b/_config.yml
index 9444854..273fa65 100755
--- a/_config.yml
+++ b/_config.yml
@@ -161,6 +161,14 @@ social:
 
 404-img: "/img/labtocat.png"
 
+##################
+# GPG on Keybase #
+##################
+
+keybase-username: johnsmith
+keybase-in-social: True
+keybase-in-footer: True
+
 ################################################################################
 
 # NB! Tread carefully if you want to change the variables below this point!
diff --git a/_includes/footer.html b/_includes/footer.html
index 7ae51fc..91ff1aa 100755
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,5 +1,4 @@
-
- <!-- Footer Start -->
+<!-- Footer Start -->
 
 <footer>
 
@@ -8,7 +7,11 @@
     <p><br><br></p>
 
     <div class="container text-center">
-      <p>Copyright &copy; {{ site.author }} {{ site.time | date: "%Y" }}</p>
+        <p>Copyright &copy; {{ site.author }} {{ site.time | date: "%Y" }}</p>
+        {% if site.keybase-in-footer %}
+        <p style="font-size: 16px;"><a href="https://keybase.io/{{site.keybase-username}}" target="_blank"><i
+                class="fa fa-key"></i> {{site.keybase-username}} on Keybase</a></p>
+        {% endif %}
     </div>
 </footer>
 
diff --git a/_includes/social-buttons.html b/_includes/social-buttons.html
index 6b90319..7dbbf36 100644
--- a/_includes/social-buttons.html
+++ b/_includes/social-buttons.html
@@ -1,10 +1,12 @@
-
 <!-- Social Buttons Start -->
 
 <ul class="list-inline social-buttons">
-  {% for network in site.social %}
+    {% for network in site.social %}
     <li><a href="{{ network.url }}" target="_blank"><i class="fa fa-{{ network.title }} fa-fw"></i></a></li>
-  {% endfor %}
+    {% endfor %}
+    {% if site.keybase-in-social %}
+    <li><a href="https://keybase.io/{{site.keybase-username}}" target="_blank"><i class="fa fa-key fa-fw"></i></a></li>
+    {% endif %}
 </ul>
 
 <!-- Social Buttons End -->
diff --git a/scripts/serve-lan b/scripts/serve-lan
new file mode 100644
index 0000000..1e872ac
--- /dev/null
+++ b/scripts/serve-lan
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo iptables -I INPUT -p tcp --dport 4000 -j ACCEPT
+jekyll serve --watch --host "0.0.0.0" --baseurl ""
diff --git a/scripts/serve-lan-production b/scripts/serve-lan-production
new file mode 100644
index 0000000..ccbc119
--- /dev/null
+++ b/scripts/serve-lan-production
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+sudo iptables -I INPUT -p tcp --dport 4000 -j ACCEPT
+JEKYLL_ENV=production jekyll serve --host "0.0.0.0" --baseurl ""