diff --git a/mywiki/tiddlers/Bash Tips.tid b/mywiki/tiddlers/Bash Tips.tid
new file mode 100644
index 0000000..c26f407
--- /dev/null
+++ b/mywiki/tiddlers/Bash Tips.tid	
@@ -0,0 +1,10 @@
+created: 20160406131419668
+creator: user
+modified: 20160406131446463
+modifier: user
+tags: 
+title: Bash Tips
+type: text/vnd.tiddlywiki
+
+; passing parameters to bash when executing a script fetched by curl
+: http://stackoverflow.com/questions/4642915/passing-parameters-to-bash-when-executing-a-script-fetched-by-curl
\ No newline at end of file
diff --git a/mywiki/tiddlers/Blogging.tid b/mywiki/tiddlers/Blogging.tid
index 99300e5..5511687 100644
--- a/mywiki/tiddlers/Blogging.tid
+++ b/mywiki/tiddlers/Blogging.tid
@@ -1,6 +1,6 @@
 created: 20160112093241657
 creator: user
-modified: 20160401202245120
+modified: 20160405202052307
 modifier: user
 tags: 
 title: Blogging
@@ -17,4 +17,7 @@ docker run --name ghost -p 2368:2368 -v /Users/aiko/.ghost/blog:/var/lib/ghost -
 : http://node1.aiko.sh:2368
 
 ; Add code highlighting to your Ghost blog.
-: http://www.incrediblemolk.com/add-code-highlighting-to-your-ghost-blog/
\ No newline at end of file
+: http://www.incrediblemolk.com/add-code-highlighting-to-your-ghost-blog/
+
+; How to Use Ghost
+: http://support.ghost.org/how-to-use-ghost/
\ No newline at end of file
diff --git a/mywiki/tiddlers/Domotica.tid b/mywiki/tiddlers/Domotica.tid
new file mode 100644
index 0000000..38df73d
--- /dev/null
+++ b/mywiki/tiddlers/Domotica.tid
@@ -0,0 +1,20 @@
+created: 20160405202927748
+creator: user
+modified: 20160405205940927
+modifier: user
+tags: 
+title: Domotica
+type: text/vnd.tiddlywiki
+
+
+; ~MySensors
+: http://www.mysensors.org/
+
+; Raspberry Pi, RFXCom and Domoticz
+: https://agileek.github.io/home_automation/2015/12/05/home_automation_domoticz/
+
+; Docker container for Domoticz
+: https://hub.docker.com/r/quantumobject/docker-domoticz/
+
+; 
+: http://www.orvibo.com/index_en.html
\ No newline at end of file
diff --git a/mywiki/tiddlers/Elixir.tid b/mywiki/tiddlers/Elixir.tid
index c8d5e45..b331133 100644
--- a/mywiki/tiddlers/Elixir.tid
+++ b/mywiki/tiddlers/Elixir.tid
@@ -1,6 +1,6 @@
 created: 20151217170123889
 creator: user
-modified: 20160114152541019
+modified: 20160405202859420
 modifier: user
 tags: 
 title: Elixir
@@ -50,3 +50,12 @@ type: text/vnd.tiddlywiki
 
 ; A Docker container for the Phoenix framework
 : https://github.com/marcelocg/phoenix-docker
+
+; Pub/Sub in 30 Lines of Elixir
+: http://tech.noredink.com/post/141444822213/pubsub-in-30-lines-of-elixir
+
+; IntelliJ Plugin for Elixir
+: https://github.com/KronicDeth/intellij-elixir
+
+; Static Code analysis tool (jshint like)
+: https://github.com/rrrene/credo
\ No newline at end of file
diff --git a/mywiki/tiddlers/GitHub.tid b/mywiki/tiddlers/GitHub.tid
new file mode 100644
index 0000000..fe79e37
--- /dev/null
+++ b/mywiki/tiddlers/GitHub.tid
@@ -0,0 +1,9 @@
+created: 20160405203401788
+creator: user
+modified: 20160405203440796
+modifier: user
+tags: 
+title: GitHub
+type: text/vnd.tiddlywiki
+
+* https://github.com/aikomastboom
\ No newline at end of file
diff --git a/mywiki/tiddlers/IDEA IntelliJ.tid b/mywiki/tiddlers/IDEA IntelliJ.tid
new file mode 100644
index 0000000..fb073bf
--- /dev/null
+++ b/mywiki/tiddlers/IDEA IntelliJ.tid	
@@ -0,0 +1,10 @@
+created: 20160405090533053
+creator: user
+modified: 20160405090611682
+modifier: user
+tags: 
+title: IDEA IntelliJ
+type: text/vnd.tiddlywiki
+
+; How to config intellij-idea not format some part of the code?
+: http://stackoverflow.com/questions/14020200/how-to-config-intellij-idea-not-format-some-part-of-the-code
\ No newline at end of file
diff --git a/mywiki/tiddlers/Jenkins.tid b/mywiki/tiddlers/Jenkins.tid
new file mode 100644
index 0000000..41002fb
--- /dev/null
+++ b/mywiki/tiddlers/Jenkins.tid
@@ -0,0 +1,25 @@
+created: 20160405085056604
+creator: user
+modified: 20160408073845689
+modifier: user
+tags: 
+title: Jenkins
+type: text/vnd.tiddlywiki
+
+; Official Repository Jenkins
+: https://hub.docker.com/_/jenkins/
+
+; How to Set Up ~TravisCI-like Continuous Integration with Docker and Jenkins
+: https://zapier.com/engineering/continuous-integration-jenkins-docker-github/
+
+; GitHub Pull Request Builder Plugin
+: https://github.com/jenkinsci/ghprb-plugin
+
+; Docker Custom Build Environment Plugin
+: https://github.com/jenkinsci/docker-custom-build-environment-plugin
+ 
+; How to display the code coverage report using Jenkins Post-build actions.
+: https://wiki.servoy.com/display/public/DOCS/Using+Istanbul+to+integrate+code+coverage+report+in+Jenkins
+
+; GitHub about Webhooks
+: https://help.github.com/articles/about-webhooks/
\ No newline at end of file
diff --git a/mywiki/tiddlers/Mail.tid b/mywiki/tiddlers/Mail.tid
index a26bc9a..7cc45aa 100644
--- a/mywiki/tiddlers/Mail.tid
+++ b/mywiki/tiddlers/Mail.tid
@@ -1,9 +1,16 @@
 created: 20160225204139217
 creator: user
-modified: 20160225204153508
+modified: 20160405195749171
 modifier: user
 tags: 
 title: Mail
 type: text/vnd.tiddlywiki
 
-http://blog.mobile-harddisk.nl/tutorials/synology-mailserver-instellen-met-fallback-server/
\ No newline at end of file
+; Synology Mail Server instellen mét fallback server
+: http://blog.mobile-harddisk.nl/tutorials/synology-mailserver-instellen-met-fallback-server/
+
+; DKIM Core Technical Specification
+: http://dkimcore.org/specification.html
+
+; aiko.sh DNS
+: https://www.transip.nl/cp/domein-hosting/domeinnaam/prm/1460720/aiko.sh/
\ No newline at end of file
diff --git a/mywiki/tiddlers/Rancher.tid b/mywiki/tiddlers/Rancher.tid
index 5f2c370..72ee8ac 100644
--- a/mywiki/tiddlers/Rancher.tid
+++ b/mywiki/tiddlers/Rancher.tid
@@ -1,10 +1,16 @@
 created: 20151217170810197
 creator: user
-modified: 20151217170901779
+modified: 20160405202235141
 modifier: user
 tags: docker
 title: Rancher
 type: text/vnd.tiddlywiki
 
+; Docker Cloud - Your first service
+: https://docs.docker.com/docker-cloud/getting-started/your_first_service/
+
+; My Docker Cloud on black machine
+: https://cloud.docker.com/container/service/4f127ef8-a6e9-4b34-a308-673812ceb89f/show/#container-endpoints
+
 ;In this guide, we will create a simple Rancher install, which is a single host installation that runs everything on a single Linux machine.
 :http://docs.rancher.com/rancher/quick-start-guide/
\ No newline at end of file
diff --git a/mywiki/tiddlers/ReactJS.tid b/mywiki/tiddlers/ReactJS.tid
index b0fa6e2..798c4c5 100644
--- a/mywiki/tiddlers/ReactJS.tid
+++ b/mywiki/tiddlers/ReactJS.tid
@@ -1,6 +1,6 @@
 created: 20160114152911183
 creator: user
-modified: 20160331132746816
+modified: 20160405084940620
 modifier: user
 tags: 
 title: ReactJS
@@ -12,6 +12,9 @@ type: text/vnd.tiddlywiki
 ; The Reactive Extensions for ~JavaScript
 : https://github.com/Reactive-Extensions/RxJS
 
+; RxJS-DOM/src/dom/websocket.js
+: https://github.com/Reactive-Extensions/RxJS-DOM/blob/master/src/dom/websocket.js
+
 ; Interactive diagrams of Rx Observables
 : http://rxmarbles.com
 
@@ -22,4 +25,7 @@ type: text/vnd.tiddlywiki
 : http://xgrommx.github.io/rx-book/
 
 ; The introduction to Reactive Programming you've been missing
-: https://gist.github.com/staltz/868e7e9bc2a7b8c1f754
\ No newline at end of file
+: https://gist.github.com/staltz/868e7e9bc2a7b8c1f754
+
+; Learning Observable By Building Observable
+: https://medium.com/@benlesh/learning-observable-by-building-observable-d5da57405d87
\ No newline at end of file
diff --git a/mywiki/tiddlers/Schuberg Philis.tid b/mywiki/tiddlers/Schuberg Philis.tid
new file mode 100644
index 0000000..085639c
--- /dev/null
+++ b/mywiki/tiddlers/Schuberg Philis.tid	
@@ -0,0 +1,17 @@
+created: 20160405091836861
+creator: user
+modified: 20160405121445514
+modifier: user
+tags: 
+title: Schuberg Philis
+type: text/vnd.tiddlywiki
+
+* https://www.schubergphilis.com
+
+
+
+
+
+
+
+
diff --git a/mywiki/tiddlers/Shipyard.tid b/mywiki/tiddlers/Shipyard.tid
new file mode 100644
index 0000000..450e1c7
--- /dev/null
+++ b/mywiki/tiddlers/Shipyard.tid
@@ -0,0 +1,25 @@
+created: 20160414083249241
+creator: user
+modified: 20160414083617669
+modifier: user
+tags: docker
+title: Shipyard
+type: text/vnd.tiddlywiki
+
+; Shipyard
+: http://shipyard-project.com
+
+; Shipyard install guts script
+: https://shipyard-project.com/deploy
+
+```
+curl -sSL https://shipyard-project.com/deploy | TLS_CERT_PATH=$(pwd)/.docker/machine/machines/boot2docker PORT=2380 PROXY_PORT=2377 bash -s
+```
+
+
+cleanup
+
+```
+docker ps -a |grep shipyard | awk '{print $1}' | xargs docker stop ; docker ps -a |grep shipyard | awk '{print $1}' | xargs docker rm
+```
+
diff --git a/mywiki/tiddlers/TiddlyWiki5.tid b/mywiki/tiddlers/TiddlyWiki5.tid
index 5a62ae8..40483f5 100644
--- a/mywiki/tiddlers/TiddlyWiki5.tid
+++ b/mywiki/tiddlers/TiddlyWiki5.tid
@@ -1,6 +1,6 @@
 created: 20150304213240781
 creator: user
-modified: 20150505131004234
+modified: 20160405202311217
 modifier: user
 tags: tiddlywiki
 title: TiddlyWiki5
@@ -14,4 +14,7 @@ type: text/vnd.tiddlywiki
 * http://tiddlywiki.com/static/TiddlyWikiFolders.html
 * http://tiddlyweb.tiddlyspace.com
 * http://tiddlywiki.com/#Widgets%20in%20WikiText
-* http://inmysocks.tiddlyspot.com/#What%20to%20do
\ No newline at end of file
+* http://inmysocks.tiddlyspot.com/#What%20to%20do
+
+; From Text Files to Evernote and Keep
+: http://blog.htmlfusion.com/tiddlywiki-evernote-with-vim-and-markdown/
\ No newline at end of file
diff --git a/mywiki/tiddlers/Zwenkgras 20.tid b/mywiki/tiddlers/Zwenkgras 20.tid
new file mode 100644
index 0000000..64ad6e1
--- /dev/null
+++ b/mywiki/tiddlers/Zwenkgras 20.tid	
@@ -0,0 +1,19 @@
+created: 20160405202356084
+creator: user
+modified: 20160405202609066
+modifier: user
+tags: 
+title: Zwenkgras 20
+type: text/vnd.tiddlywiki
+
+; Dakisolatie 
+: http://www.isolatie.net/dakisolatie/
+
+; Taxus
+: http://www.vergrootdehoop.nl
+
+; Overzicht giftige tuinplanten
+: http://www.baaij-hoveniers.nl/beplanting/giftige_planten.htm
+
+; Bouw- en sloopafval
+: http://gemeente.leiden.nl/themas/afval/bouw-en-sloopafval/
\ No newline at end of file
diff --git a/mywiki/tiddlers/docker images -t.tid b/mywiki/tiddlers/docker images -t.tid
index 9fb2c09..bdd5571 100644
--- a/mywiki/tiddlers/docker images -t.tid	
+++ b/mywiki/tiddlers/docker images -t.tid	
@@ -1,11 +1,13 @@
 created: 20150929135639041
 creator: user
-modified: 20160112085221443
+modified: 20160406134632426
 modifier: user
 tags: 
 title: docker images -t
 type: text/vnd.tiddlywiki
 
+tree view
+
 ```sh
 docker run --rm -v /var/run/docker.sock:/var/run/docker.sock nate/dockviz images -t
 ```
diff --git a/mywiki/tiddlers/rkt.tid b/mywiki/tiddlers/rkt.tid
new file mode 100644
index 0000000..3aa28df
--- /dev/null
+++ b/mywiki/tiddlers/rkt.tid
@@ -0,0 +1,10 @@
+created: 20160405203321221
+creator: user
+modified: 20160405203358646
+modifier: user
+tags: 
+title: rkt
+type: text/vnd.tiddlywiki
+
+; GitHub rkt
+: https://github.com/coreos/rkt
\ No newline at end of file