diff --git a/mywiki/tiddlers/AngularJS.tid b/mywiki/tiddlers/AngularJS.tid
index 85d081a..72f4243 100644
--- a/mywiki/tiddlers/AngularJS.tid
+++ b/mywiki/tiddlers/AngularJS.tid
@@ -1,17 +1,40 @@
 created: 20160624102109622
 creator: user
-modified: 20160624120552912
+modified: 20160822074410176
 modifier: user
 tags: 
 title: AngularJS
 type: text/vnd.tiddlywiki
 
+! Loaders
+; How to implement loaders for an AngularJS app
+: https://sc5.io/posts/how-to-implement-loaders-for-an-angularjs-app/
+
 ! Routing
 ; UI-Router
 : https://github.com/angular-ui/ui-router/wiki
 
+; Pitfalls using ui-router's resolve
+: http://www.codelord.net/2015/06/02/angularjs-pitfalls-using-ui-routers-resolve/
+
+; Advanced routing and resolves
+: https://medium.com/opinionated-angularjs/advanced-routing-and-resolves-a2fcbf874a1c#.e0xia96vl
+
+; How to force AngularJS resource resolution with ui-router
+: http://www.jvandemo.com/how-to-resolve-angularjs-resources-with-ui-router/
+
 ! Forms
 ;~AngularJS: API Error codes handling in Forms
 :https://medium.com/@skosno/server-error-handing-in-angularjs-forms-c5fd38ccf0fc
 ;On the Bleeding Edge: Advanced ~AngularJS Form Validation
-:http://code.realcrowd.com/on-the-bleeding-edge-advanced-angularjs-form-validation/
\ No newline at end of file
+:http://code.realcrowd.com/on-the-bleeding-edge-advanced-angularjs-form-validation/
+
+! Pagination
+
+; Paginate (almost) Anything in AngularJS
+: http://www.michaelbromley.co.uk/blog/108/paginate-almost-anything-in-angularjs
+
+! Upload
+; nb-flow
+: https://github.com/flowjs/ng-flow
+: https://github.com/flowjs/flow.js
\ No newline at end of file
diff --git a/mywiki/tiddlers/AngularJS_RxJS.tid b/mywiki/tiddlers/AngularJS_RxJS.tid
index c0ed353..905cf62 100644
--- a/mywiki/tiddlers/AngularJS_RxJS.tid
+++ b/mywiki/tiddlers/AngularJS_RxJS.tid
@@ -1,10 +1,13 @@
 created: 20160617085508353
 creator: user
-modified: 20160624102407163
+modified: 20160822074035097
 modifier: user
 tags: 
 title: AngularJS/RxJS
 type: text/vnd.tiddlywiki
 
 ; AngularJS — Introduction to Reactive Extensions (RxJS)
-: https://medium.com/google-developer-experts/angular-introduction-to-reactive-extensions-rxjs-a86a7430a61f
\ No newline at end of file
+: https://medium.com/google-developer-experts/angular-introduction-to-reactive-extensions-rxjs-a86a7430a61f
+
+; Combining Multiple RxJs Streams In Angular 2.0
+: http://www.syntaxsuccess.com/viewarticle/combining-multiple-rxjs-streams-in-angular-2.0
\ No newline at end of file
diff --git a/mywiki/tiddlers/Arduino.tid b/mywiki/tiddlers/Arduino.tid
index e9ce770..9003cfd 100644
--- a/mywiki/tiddlers/Arduino.tid
+++ b/mywiki/tiddlers/Arduino.tid
@@ -1,6 +1,6 @@
 created: 20150409091208232
 creator: user
-modified: 20150409091255020
+modified: 20160812073004307
 modifier: user
 tags: 
 title: Arduino
@@ -8,3 +8,25 @@ type: text/vnd.tiddlywiki
 
 * http://www.bitscope.com/product/BS05/
 * http://arduino.cc/en/Tutorial/HomePage
+
+; Complete Beginner's Guide For Arduino Hardware Platform For DIY
+: http://www.codeproject.com/Articles/845211/Stage-Complete-Beginners-Guide-For-Arduino-Hardwar
+
+Battery Powered:
+; Feeding power to Arduino: the ultimate guide
+: http://www.open-electronics.org/the-power-of-arduino-this-unknown/
+
+; How to Run an Arduino for Years on a Battery
+: https://www.openhomeautomation.net/arduino-battery/
+
+; ~JeeLib is an Arduino IDE library for ~JeeNodes (made by ~JeeLabs)
+: https://github.com/jcw/jeelib
+
+; Developing a low-power sketch
+: http://jeelabs.org/2011/12/13/developing-a-low-power-sketch/
+
+; ARDUINO LOW POWER - HOW TO RUN ATMEGA328P FOR A YEAR ON COIN CELL BATTERY
+: http://www.home-automation-community.com/arduino-low-power-how-to-run-atmega328p-for-a-year-on-coin-cell-battery/
+
+; a 9V battery is NOT a good power source
+: http://cybergibbons.com/uncategorized/arduino-misconceptions-6-a-9v-battery-is-a-good-power-source/
\ No newline at end of file
diff --git a/mywiki/tiddlers/Chip.tid b/mywiki/tiddlers/Chip.tid
new file mode 100644
index 0000000..627fd2d
--- /dev/null
+++ b/mywiki/tiddlers/Chip.tid
@@ -0,0 +1,19 @@
+created: 20160726124221793
+creator: user
+modified: 20160726133226452
+modifier: user
+tags: 
+title: Chip
+type: text/vnd.tiddlywiki
+
+; GPIO
+: http://docs.getchip.com/chip.html#gpio
+
+; A CHIP GPIO library
+: https://github.com/xtacocorex/CHIP_IO
+
+; GPIO_Info
+: http://www.chip-community.org/index.php/GPIO_Info
+
+
+
diff --git a/mywiki/tiddlers/CycleJS.tid b/mywiki/tiddlers/CycleJS.tid
index 4170867..b24bfb6 100644
--- a/mywiki/tiddlers/CycleJS.tid
+++ b/mywiki/tiddlers/CycleJS.tid
@@ -1,6 +1,6 @@
 created: 20150930083903137
 creator: user
-modified: 20160502204432222
+modified: 20160822072731012
 modifier: user
 tags: 
 title: CycleJS
@@ -12,6 +12,9 @@ type: text/vnd.tiddlywiki
 ; A time traveling debugger for Cycle.js 
 : https://github.com/cyclejs/cycle-time-travel
 
+; A curated list of awesome Cycle.js resources
+: https://github.com/cyclejs-community/awesome-cyclejs
+
 ; Cycle JS Fundamentals
 : https://egghead.io/series/cycle-js-fundamentals
 
diff --git a/mywiki/tiddlers/DHT11.tid b/mywiki/tiddlers/DHT11.tid
new file mode 100644
index 0000000..542cebf
--- /dev/null
+++ b/mywiki/tiddlers/DHT11.tid
@@ -0,0 +1,13 @@
+created: 20160726133213742
+creator: user
+modified: 20160726133249089
+modifier: user
+tags: 
+title: DHT11
+type: text/vnd.tiddlywiki
+
+; DHT11 HUMIDITY & TEMPERATURE SENSOR MODULE
+: http://www.uugear.com/portfolio/dht11-humidity-temperature-sensor-module/
+
+; datasheet
+: http://www.oddwires.com/content/DHT11.pdf
\ No newline at end of file
diff --git a/mywiki/tiddlers/Domotica.tid b/mywiki/tiddlers/Domotica.tid
index 52472f1..ad1e44d 100644
--- a/mywiki/tiddlers/Domotica.tid
+++ b/mywiki/tiddlers/Domotica.tid
@@ -1,6 +1,6 @@
 created: 20160405202927748
 creator: user
-modified: 20160425072748290
+modified: 20160822073556560
 modifier: user
 tags: 
 title: Domotica
@@ -29,4 +29,13 @@ $ touch domoticz/domoticz.db
 $ docker run --cap-add=SYS_RAWIO --device=/dev/vchiq --device=/dev/ttyUSB0 -e LD_LIBRARY_PATH=/opt/vc/lib -v /opt/vc:/opt/vc:ro -v /etc/localtime:/etc/localtime -v /mnt/pi/data/domoticz/domoticz.db:/root/domoticz/domoticz.db:rw -p 1888:8080 --name domoticz --restart=always -d agileek/rpi-domoticz-docker:3.4834
 ```
 
-: https://www.domoticz.com/wiki/Camera_Setup#Foscam_FI9821W_V2
\ No newline at end of file
+: https://www.domoticz.com/wiki/Camera_Setup#Foscam_FI9821W_V2
+
+
+
+; Humidity control
+: http://www.domoticz.com/wiki/Humidity_control
+: http://math.stackexchange.com/questions/461076/converting-realtive-humidity-and-temperature-to-an-absolute-value
+
+; dzEvents
+: https://github.com/dannybloe/dzVents
\ No newline at end of file
diff --git a/mywiki/tiddlers/Duurzaam Leiden.tid b/mywiki/tiddlers/Duurzaam Leiden.tid
new file mode 100644
index 0000000..5d09033
--- /dev/null
+++ b/mywiki/tiddlers/Duurzaam Leiden.tid	
@@ -0,0 +1,24 @@
+created: 20160726134518181
+creator: user
+modified: 20160822073116723
+modifier: user
+tags: 
+title: Duurzaam Leiden
+type: text/vnd.tiddlywiki
+
+; Duurzaamheidsfonds investeren in thuis - Leiden
+: https://gemeente.leiden.nl/over-de-stad/duurzaam-leiden/subsidies/investeer-in-thuis/
+
+; Zonneboilers
+: http://duurzaambouwloket.nl/maatregelen-zonneboilers-10-energie-2-4.html
+; De gemeente Leiden heeft het fonds Investeren in thuis opgericht.
+: http://duurzaambouwloket.nl/subsidie-leningen-47-84.html
+
+;
+: https://www.svn.nl/rentetarieven#duurzaamheidslening
+
+
+! Overheid
+
+; Subsidie voor zonneboilers (ISDE)
+: http://www.rvo.nl/subsidies-regelingen/investeringssubsidie-duurzame-energie/voor-welke-apparaten/zonneboilers
diff --git a/mywiki/tiddlers/Git Cheats.tid b/mywiki/tiddlers/Git Cheats.tid
index a903203..7dd20aa 100644
--- a/mywiki/tiddlers/Git Cheats.tid	
+++ b/mywiki/tiddlers/Git Cheats.tid	
@@ -1,11 +1,15 @@
 created: 20150312123759865
 creator: user
-modified: 20150930084731440
+modified: 20160815075231019
 modifier: user
 tags: git
 title: Git Cheats
 type: text/vnd.tiddlywiki
 
+```
+alias gitfetchprune='git fetch --prune && git branch -r | awk '\''{print $1}'\'' | egrep -v -f /dev/fd/0 <(git branch -vv | grep origin) | awk '\''{print $1}'\'' | xargs git branch -d'
+```
+
 ; How to undo (almost) anything with Git
 : https://github.com/blog/2019-how-to-undo-almost-anything-with-git
 
diff --git a/mywiki/tiddlers/JavaScript.tid b/mywiki/tiddlers/JavaScript.tid
new file mode 100644
index 0000000..562a803
--- /dev/null
+++ b/mywiki/tiddlers/JavaScript.tid
@@ -0,0 +1,10 @@
+created: 20160822073229972
+creator: user
+modified: 20160822073247006
+modifier: user
+title: JavaScript
+type: text/vnd.tiddlywiki
+
+
+; 9 JavaScript Tips You May Not Know
+: http://codetunnel.com/9-javascript-tips-you-may-not-know/
\ No newline at end of file
diff --git a/mywiki/tiddlers/SVG.tid b/mywiki/tiddlers/SVG.tid
new file mode 100644
index 0000000..703343c
--- /dev/null
+++ b/mywiki/tiddlers/SVG.tid
@@ -0,0 +1,10 @@
+created: 20160822072804678
+creator: user
+modified: 20160822072825329
+modifier: user
+tags: 
+title: SVG
+type: text/vnd.tiddlywiki
+
+; A lightweight JavaScript library that generates circular graphs in SVG.
+: https://github.com/lugolabs/circles
\ No newline at end of file
diff --git a/mywiki/tiddlers/ZSH.tid b/mywiki/tiddlers/ZSH.tid
new file mode 100644
index 0000000..117f6a1
--- /dev/null
+++ b/mywiki/tiddlers/ZSH.tid
@@ -0,0 +1,18 @@
+created: 20160815074937159
+creator: user
+modified: 20160815075443378
+modifier: user
+tags: 
+title: ZSH
+type: text/vnd.tiddlywiki
+
+plugins=(git bower docker history node npm osx ssh-agent fasd)
+
+; “Oh My ZSH!”
+: http://ohmyz.sh
+
+; Unlimited history in zsh
+: http://unix.stackexchange.com/questions/273861/unlimited-history-in-zsh
+
+; Fasd
+: https://github.com/clvv/fasd
diff --git a/mywiki/tiddlers/domotica mqtt.tid b/mywiki/tiddlers/domotica mqtt.tid
new file mode 100644
index 0000000..ac4bc0c
--- /dev/null
+++ b/mywiki/tiddlers/domotica mqtt.tid	
@@ -0,0 +1,10 @@
+created: 20160822073333876
+creator: user
+modified: 20160822073401301
+modifier: user
+tags: 
+title: domotica mqtt
+type: text/vnd.tiddlywiki
+
+;
+: https://www.domoticz.com/wiki/MQTT
\ No newline at end of file
diff --git a/mywiki/tiddlers/nginx.tid b/mywiki/tiddlers/nginx.tid
new file mode 100644
index 0000000..0c3e783
--- /dev/null
+++ b/mywiki/tiddlers/nginx.tid
@@ -0,0 +1,11 @@
+created: 20160822073146822
+creator: user
+modified: 20160822073206830
+modifier: user
+tags: 
+title: nginx
+type: text/vnd.tiddlywiki
+
+
+; Automated nginx proxy for Docker containers using docker-gen
+: https://github.com/jwilder/nginx-proxy
\ No newline at end of file
diff --git a/mywiki/tiddlers/use usb stick with docker.tid b/mywiki/tiddlers/use usb stick with docker.tid
index 10784bb..bc44baa 100644
--- a/mywiki/tiddlers/use usb stick with docker.tid	
+++ b/mywiki/tiddlers/use usb stick with docker.tid	
@@ -1,6 +1,6 @@
 created: 20150511071117085
 creator: user
-modified: 20160717204551153
+modified: 20160830195726481
 modifier: user
 tags: 
 title: use usb stick with docker
@@ -56,5 +56,5 @@ $ cat /etc/fstab
 
 proc			/proc	proc	defaults	0	0
 /dev/mmcblk0p1	/boot	vfat	defaults	0	0
-UUID=16e0972d-6abf-4369-be0e-5fd2e10a070a	/mnt/usb	ext4	defaults,noatime	0	0
+UUID=16e0972d-6abf-4369-be0e-5fd2e10a070a	/mnt/usb	ext4	commit=600,noatime	0	0
 ```
\ No newline at end of file