diff --git a/_config.yml b/_config.yml
index d0ac3f2..e37a821 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,5 @@
 # location
-absolute: http://csbnw.no-ip.org:3838
+absolute: http://csbnw.no-iphoto.org:3838
 baseurl: .
 asset_prefix: /asset
 static_prefix: /static
diff --git a/_data/gallery/2013-dundee.yml b/_data/gallery/2013-dundee.yml
new file mode 100644
index 0000000..940cf9d
--- /dev/null
+++ b/_data/gallery/2013-dundee.yml
@@ -0,0 +1,2 @@
+- 236a633
+- ad2b297
diff --git a/_data/gallery/2013-edinburgh.yml b/_data/gallery/2013-edinburgh.yml
new file mode 100644
index 0000000..e4a74b7
--- /dev/null
+++ b/_data/gallery/2013-edinburgh.yml
@@ -0,0 +1,37 @@
+- 482452e
+- b091e3f
+- 80db970
+- 725d113
+- 1197f83
+- 958772b
+- 6d39d8f
+- f7a009b
+- 293521a
+- e8d614b
+- 1e7fe9e
+- 1967c83
+- 1150f6d
+- f7fcc6a
+- 6237d8c
+- 42f26ff
+- b282557
+- ed9f15f
+- 82fe1cd
+- a041855
+- e78a2ea
+- 5c8bc06
+- 0d8e788
+- c395de3
+- 37c6ca8
+- 931fc98
+- 0ac0e6b
+- af8ee50
+- 69a7569
+- c1e7287
+- e0ef82c
+- 721d526
+- 516bb78
+- ce33533
+- 0b27ad7
+- a8cd357
+- c6408ed
diff --git a/_data/gallery/2013-guy-fawkes-bonfire.yml b/_data/gallery/2013-guy-fawkes-bonfire.yml
new file mode 100644
index 0000000..e62cc4e
--- /dev/null
+++ b/_data/gallery/2013-guy-fawkes-bonfire.yml
@@ -0,0 +1,2 @@
+- 40ebf13
+- b316a8f
diff --git a/_data/gallery/2013-miscellaneous.yml b/_data/gallery/2013-miscellaneous.yml
new file mode 100644
index 0000000..e6d9571
--- /dev/null
+++ b/_data/gallery/2013-miscellaneous.yml
@@ -0,0 +1,2 @@
+- 16eb3da
+- db12a2f
diff --git a/_data/gallery/2013-school.yml b/_data/gallery/2013-school.yml
new file mode 100644
index 0000000..5bb9946
--- /dev/null
+++ b/_data/gallery/2013-school.yml
@@ -0,0 +1,5 @@
+- 1c84d8a
+- b43d43c
+- 90f86ae
+- c6c7b38
+- bfb4534
diff --git a/_data/gallery/2013-train.yml b/_data/gallery/2013-train.yml
new file mode 100644
index 0000000..9f84e6b
--- /dev/null
+++ b/_data/gallery/2013-train.yml
@@ -0,0 +1,18 @@
+- c341c2e
+- aaea74b
+- 4f57220
+- 4e57ab8
+- 1039d58
+- 48a04c1
+- e6bba51
+- 0492706
+- 5778593
+- d4b3d57
+- 43d49b1
+- 056d9e8
+- 7939955
+- a299d7a
+- c1282dc
+- be138f3
+- d1e2e9c
+- ee2c537
diff --git a/_data/gallery/2013-visit-bram.yml b/_data/gallery/2013-visit-bram.yml
new file mode 100644
index 0000000..352390a
--- /dev/null
+++ b/_data/gallery/2013-visit-bram.yml
@@ -0,0 +1,29 @@
+- 9f58823
+- 8205372
+- 768b70c
+- f12a626
+- a8e0b3a
+- e1f0287
+- f9756fb
+- 21605c7
+- b7cb4d9
+- 5e860de
+- f5043b0
+- a9a7aea
+- 608307e
+- 4ae8e30
+- 3d7f2be
+- 86f09c0
+- ffdbe2b
+- 0e378e6
+- 3c23fb2
+- aace0c4
+- 7f42f35
+- 1d1bcc0
+- 4e28fd9
+- 2302af0
+- 7caa5de
+- 9ae4341
+- 44de54e
+- d1a78f6
+- bbfd853
diff --git a/_data/gallery/2013-visit.yml b/_data/gallery/2013-visit.yml
new file mode 100644
index 0000000..f8ee624
--- /dev/null
+++ b/_data/gallery/2013-visit.yml
@@ -0,0 +1,25 @@
+- 621590c
+- 7ed7cf3
+- 6b6f576
+- cfadeb2
+- a30cd0f
+- c9b371d
+- 103794c
+- c0d7445
+- c13088c
+- 9d31169
+- 683c571
+- a4a5d80
+- e63edcb
+- bd99fb2
+- 343d363
+- 5cfe58f
+- 19358cd
+- 0b7fade
+- ba90b47
+- c01b359
+- 23f8e70
+- 19f4216
+- 443a682
+- c485092
+- b45414c
diff --git a/_data/gallery/2013-wallace-monument.yml b/_data/gallery/2013-wallace-monument.yml
new file mode 100644
index 0000000..c9952e9
--- /dev/null
+++ b/_data/gallery/2013-wallace-monument.yml
@@ -0,0 +1,33 @@
+- ddeb05f
+- a1a0910
+- b0b9d1d
+- 8169e74
+- 235345e
+- 61fbf21
+- 93e0eb2
+- 9ea8cce
+- 0943f2d
+- f5b3016
+- 0743f54
+- 69e351f
+- 85babff
+- 6212a95
+- 1b55538
+- 8ad3fa1
+- e7e5f0a
+- eb508de
+- 3e9d9bf
+- d300e61
+- 29e40e2
+- aa136aa
+- fa6cc75
+- eef3de8
+- ad6923d
+- 71941f6
+- b41e1c7
+- de3e87a
+- 57f512e
+- f26e022
+- 8a1e9c0
+- a0343f3
+- 0f91213
diff --git a/_data/gallery/2013-west-sands.yml b/_data/gallery/2013-west-sands.yml
new file mode 100644
index 0000000..bf35de0
--- /dev/null
+++ b/_data/gallery/2013-west-sands.yml
@@ -0,0 +1,5 @@
+- 9525234
+- 7379c1b
+- c909bb1
+- 8a51bcd
+- 4118462
diff --git a/_data/gallery/2014-anstruther.yml b/_data/gallery/2014-anstruther.yml
new file mode 100644
index 0000000..f7147a2
--- /dev/null
+++ b/_data/gallery/2014-anstruther.yml
@@ -0,0 +1,16 @@
+- 655c76a
+- 48daa05
+- 1693cf9
+- fe576f2
+- 77526de
+- e0513e6
+- 8fa9d31
+- 39bd8f9
+- 02066b2
+- 91fffe8
+- 3f50593
+- e2de5ee
+- 972539b
+- 0d57902
+- 18503f4
+- efe8ddd
diff --git a/_data/gallery/2014-autumn-holidays.yml b/_data/gallery/2014-autumn-holidays.yml
new file mode 100644
index 0000000..70b540f
--- /dev/null
+++ b/_data/gallery/2014-autumn-holidays.yml
@@ -0,0 +1,93 @@
+- 65182ad
+- 052c977
+- 16812bd
+- df0c20a
+- cab8a06
+- 6e73fdf
+- 710d47e
+- a722baa
+- 52feb3d
+- e7c1fbd
+- 007b457
+- d0287c3
+- ba4a08f
+- 72d7c7a
+- 878cc7f
+- 9fa2752
+- 1bc3654
+- 26c04b5
+- a6d53ee
+- 6d95a7a
+- 273c31d
+- a840099
+- 9730c66
+- 0c67f08
+- a951a7b
+- d6db9d4
+- a9af5d4
+- 927c3a8
+- 4b529a1
+- 555674e
+- 469d03b
+- 6fc490a
+- fe925f4
+- 1c3fa29
+- acaca7f
+- c0bcc8e
+- 870d07a
+- 5911b26
+- 07f6e87
+- 1089445
+- dfd42ff
+- 003b359
+- a07084b
+- eca06a5
+- cb9811d
+- 829487c
+- e401063
+- 81f9cb7
+- 65383e6
+- f5cf077
+- 926d1ae
+- fcec42b
+- 5319a01
+- 40b333e
+- 0def998
+- f6e3f64
+- 1221550
+- 98ae532
+- 0bb3360
+- 13f9ae0
+- ed6345d
+- 3b61ab1
+- 50bc372
+- a409a03
+- a8ffc68
+- 30a3632
+- 9bfcd72
+- eb47b23
+- f93058d
+- e11b765
+- 438505c
+- 69fe011
+- fc30a40
+- 30c5f64
+- d56c12b
+- 1890c3b
+- a94e4c1
+- a70bcd6
+- b3d791b
+- c854924
+- 76c06b5
+- 77f43fd
+- 07d1fe0
+- c09c5d8
+- bf6d31c
+- b7ebd02
+- 2e48cf1
+- e24a682
+- cce0212
+- de933c5
+- 65cd2e4
+- a3ff0f8
+- 330309e
diff --git a/_data/gallery/2014-bike.yml b/_data/gallery/2014-bike.yml
new file mode 100644
index 0000000..6e2e27f
--- /dev/null
+++ b/_data/gallery/2014-bike.yml
@@ -0,0 +1,4 @@
+- 86b9f8a
+- 2723e35
+- 6f13c66
+- 2112cd6
diff --git a/_data/gallery/2014-blair-atholl-distillery.yml b/_data/gallery/2014-blair-atholl-distillery.yml
new file mode 100644
index 0000000..9372d8f
--- /dev/null
+++ b/_data/gallery/2014-blair-atholl-distillery.yml
@@ -0,0 +1,8 @@
+- 0bc1f7c
+- 6cd3355
+- 4b7b942
+- 1ba44c5
+- 372e50a
+- 9e5a0d8
+- 83947fd
+- cc2e9c4
diff --git a/_data/gallery/2014-coastal-path.yml b/_data/gallery/2014-coastal-path.yml
new file mode 100644
index 0000000..c1c4788
--- /dev/null
+++ b/_data/gallery/2014-coastal-path.yml
@@ -0,0 +1,10 @@
+- 3c66219
+- 754d0d7
+- c9ea3f3
+- b8be28e
+- 5d36fbd
+- c2f1cbf
+- e33a96e
+- 7b75179
+- a335c56
+- 658404b
diff --git a/_data/gallery/2014-conference-usic.yml b/_data/gallery/2014-conference-usic.yml
new file mode 100644
index 0000000..77e49ed
--- /dev/null
+++ b/_data/gallery/2014-conference-usic.yml
@@ -0,0 +1 @@
+- bc94eda
diff --git a/_data/gallery/2014-cooking.yml b/_data/gallery/2014-cooking.yml
new file mode 100644
index 0000000..10b62b2
--- /dev/null
+++ b/_data/gallery/2014-cooking.yml
@@ -0,0 +1,2 @@
+- 480761a
+- 2f25d67
diff --git a/_data/gallery/2014-crail.yml b/_data/gallery/2014-crail.yml
new file mode 100644
index 0000000..7016df0
--- /dev/null
+++ b/_data/gallery/2014-crail.yml
@@ -0,0 +1,17 @@
+- 78ac925
+- ad799b8
+- 39f52a8
+- ee4ad28
+- d7f1b3c
+- a9e319d
+- de85af4
+- d443c98
+- a81aa3d
+- 6de6bff
+- 481c334
+- bf454c6
+- bca9078
+- e494f68
+- de6b563
+- 8f0ef0f
+- 252aac5
diff --git a/_data/gallery/2014-edinburgh.yml b/_data/gallery/2014-edinburgh.yml
new file mode 100644
index 0000000..afb2235
--- /dev/null
+++ b/_data/gallery/2014-edinburgh.yml
@@ -0,0 +1,57 @@
+- a410687
+- e00a4e9
+- b19ebe8
+- c79dacc
+- f148b08
+- b929a9f
+- 1370224
+- 0388f32
+- 3f57b39
+- 6f2d9ab
+- 65ad15a
+- 57da2ba
+- 1f51f1e
+- 2c936c9
+- 812f405
+- f49943e
+- 7c22665
+- 5987a59
+- 2a70646
+- fcfd3a8
+- 2bf500e
+- 0710494
+- e6e40eb
+- bb4fc94
+- 5db63ae
+- b911be7
+- 8ce353a
+- ebd1c3c
+- 67763b9
+- 60a1c09
+- 0550a46
+- 2ee2acf
+- 20ade53
+- 331f011
+- eb933f6
+- 512383f
+- fc09b90
+- 685af69
+- 000d525
+- 0cdd901
+- 0639559
+- b319a77
+- aa08d7e
+- bf39987
+- 4576840
+- dd99da8
+- 7f9fb15
+- 488dc2f
+- bac208c
+- 706493f
+- 5f320ea
+- 97e79cd
+- 8ac90ed
+- 5ba7755
+- 92c505e
+- cf0a078
+- df40ee2
diff --git a/_data/gallery/2014-fife.yml b/_data/gallery/2014-fife.yml
new file mode 100644
index 0000000..e2a5600
--- /dev/null
+++ b/_data/gallery/2014-fife.yml
@@ -0,0 +1,7 @@
+- 0f06277
+- f3fac4b
+- 872614c
+- 41494b3
+- 1465670
+- d87ba0e
+- 4bb5be2
diff --git a/_data/gallery/2014-glasgow.yml b/_data/gallery/2014-glasgow.yml
new file mode 100644
index 0000000..4700d97
--- /dev/null
+++ b/_data/gallery/2014-glasgow.yml
@@ -0,0 +1,10 @@
+- 2396dc5
+- edf0f54
+- 819ca68
+- c85629d
+- 8ab87e1
+- f017173
+- d3335c6
+- a82d539
+- 389310b
+- c8c2b4e
diff --git a/_data/gallery/2014-glenshee-ski.yml b/_data/gallery/2014-glenshee-ski.yml
new file mode 100644
index 0000000..55f963e
--- /dev/null
+++ b/_data/gallery/2014-glenshee-ski.yml
@@ -0,0 +1,10 @@
+- a509f2c
+- 2493030
+- 691102c
+- ec79d73
+- 1b0f8a7
+- 8a7f91c
+- d75944a
+- e0bfe6d
+- bf58531
+- 35969f0
diff --git a/_data/gallery/2014-heathergems-factory.yml b/_data/gallery/2014-heathergems-factory.yml
new file mode 100644
index 0000000..ccfb62c
--- /dev/null
+++ b/_data/gallery/2014-heathergems-factory.yml
@@ -0,0 +1,3 @@
+- 9189da9
+- ecaf22c
+- 4490829
diff --git a/_data/gallery/2014-hike-blair-atholl.yml b/_data/gallery/2014-hike-blair-atholl.yml
new file mode 100644
index 0000000..98a539f
--- /dev/null
+++ b/_data/gallery/2014-hike-blair-atholl.yml
@@ -0,0 +1,21 @@
+- cb5b1c1
+- 390d16f
+- 7b2bbdd
+- ec7fce0
+- 8830f36
+- 5b194ea
+- a581781
+- 3f26b8f
+- 828cd90
+- 903da93
+- fe10806
+- 6d1d94b
+- 76d845b
+- 2774d8c
+- 6e6aec8
+- 82ade2e
+- 5142e2a
+- 8be2331
+- 536206f
+- c39be91
+- e20d261
diff --git a/_data/gallery/2014-holidays-uitgeest.yml b/_data/gallery/2014-holidays-uitgeest.yml
new file mode 100644
index 0000000..9f6bb6d
--- /dev/null
+++ b/_data/gallery/2014-holidays-uitgeest.yml
@@ -0,0 +1,9 @@
+- df95a51
+- 81514aa
+- f3a299c
+- 65992f3
+- 93d1337
+- f672d0b
+- 510e9f2
+- 7a3902a
+- 868e3ca
diff --git a/_data/gallery/2014-kettins.yml b/_data/gallery/2014-kettins.yml
new file mode 100644
index 0000000..dbcb55f
--- /dev/null
+++ b/_data/gallery/2014-kettins.yml
@@ -0,0 +1 @@
+- dfeb7fe
diff --git a/_data/gallery/2014-lab.yml b/_data/gallery/2014-lab.yml
new file mode 100644
index 0000000..4658bc3
--- /dev/null
+++ b/_data/gallery/2014-lab.yml
@@ -0,0 +1,11 @@
+- a7df1c3
+- 7fbdef7
+- 7cd1677
+- 4b02587
+- b355194
+- e4c20c9
+- 2fe7eb5
+- 542b2d6
+- 17eed82
+- 69e2076
+- aac5ee7
diff --git a/_data/gallery/2014-lade-braes.yml b/_data/gallery/2014-lade-braes.yml
new file mode 100644
index 0000000..7dfb0fe
--- /dev/null
+++ b/_data/gallery/2014-lade-braes.yml
@@ -0,0 +1,9 @@
+- c668162
+- ef5d19f
+- fd003dd
+- 58fa9a3
+- 79c4bb3
+- 16e3c80
+- c9e118b
+- 8352ca0
+- 49d78d7
diff --git a/_data/gallery/2014-london.yml b/_data/gallery/2014-london.yml
new file mode 100644
index 0000000..0b6c3b1
--- /dev/null
+++ b/_data/gallery/2014-london.yml
@@ -0,0 +1,42 @@
+- 8e59282
+- e931280
+- b61c768
+- 80ece0b
+- cfae326
+- bd7dd57
+- 9edb588
+- b55060e
+- 9db6668
+- 21a1973
+- 167b766
+- 46d4f09
+- 8fd08cd
+- 2f0a9e7
+- 37168a7
+- 175e4a4
+- e9a8ce2
+- 4685d41
+- 0107fba
+- 80511ef
+- c2f7617
+- aeb8e97
+- 79aceca
+- fb4ad0f
+- 08f041c
+- adf49d1
+- 4eb0504
+- 8484827
+- cf3e680
+- dbeaf61
+- 5f09187
+- 1d6e904
+- ac4835b
+- 6acb4fd
+- 16490c3
+- 8cf06a9
+- e623f9e
+- 17c5d24
+- 2d89cc4
+- 16129a9
+- 80312bc
+- edd4079
diff --git a/_data/gallery/2014-movember.yml b/_data/gallery/2014-movember.yml
new file mode 100644
index 0000000..3312343
--- /dev/null
+++ b/_data/gallery/2014-movember.yml
@@ -0,0 +1,5 @@
+- 3af6d7a
+- c02ded3
+- a4ee560
+- 9cab68f
+- 786a35e
diff --git a/_data/gallery/2014-room.yml b/_data/gallery/2014-room.yml
new file mode 100644
index 0000000..2107df4
--- /dev/null
+++ b/_data/gallery/2014-room.yml
@@ -0,0 +1,12 @@
+- 4a822c0
+- aab3b8a
+- 6ee5ba1
+- 5dc49ba
+- 9cd655f
+- f5e41f3
+- 3752cd9
+- a852e5d
+- b69ebfc
+- 187e4cf
+- fd2f9d0
+- bf7758f
diff --git a/_data/gallery/2014-seat-ibiza.yml b/_data/gallery/2014-seat-ibiza.yml
new file mode 100644
index 0000000..4b53462
--- /dev/null
+++ b/_data/gallery/2014-seat-ibiza.yml
@@ -0,0 +1,11 @@
+- 107af62
+- fce208a
+- aa7c6f4
+- 416f4df
+- 99fd724
+- d042c15
+- 37a7e57
+- 634e9b5
+- bafebf3
+- d258ed1
+- 6f63693
diff --git a/_data/gallery/2014-st-andrews.yml b/_data/gallery/2014-st-andrews.yml
new file mode 100644
index 0000000..8d8a154
--- /dev/null
+++ b/_data/gallery/2014-st-andrews.yml
@@ -0,0 +1,23 @@
+- 88a2c16
+- f3ed1b7
+- f6da79d
+- 71a8e74
+- 5061a38
+- 0466e83
+- 21e6cc3
+- 7c9e867
+- 3cfcc4b
+- cc68fbf
+- d3a67dd
+- 6383ea8
+- 4d8f437
+- 86d40a8
+- 0d857ec
+- c4a1884
+- 5568ee5
+- 2d0ebb4
+- 084b457
+- c130d74
+- 52395d5
+- beeeb81
+- 60ed2f6
diff --git a/_data/gallery/2014-strathkinness.yml b/_data/gallery/2014-strathkinness.yml
new file mode 100644
index 0000000..c258ade
--- /dev/null
+++ b/_data/gallery/2014-strathkinness.yml
@@ -0,0 +1,14 @@
+- 90be30d
+- 05d8a05
+- 7ef2536
+- a0b658f
+- 3dd9d17
+- fae19bc
+- 5280fae
+- 04e8366
+- 73efeac
+- 0afb61d
+- f72837a
+- 5783ac0
+- 64cb179
+- b93d71b
diff --git a/_data/gallery/2014-tentmuir.yml b/_data/gallery/2014-tentmuir.yml
new file mode 100644
index 0000000..d861dc8
--- /dev/null
+++ b/_data/gallery/2014-tentmuir.yml
@@ -0,0 +1,8 @@
+- 55bc23e
+- f646f54
+- bb2244f
+- ef1167e
+- 3ffd76b
+- 0d4a290
+- 797d6e1
+- 03da288
diff --git a/_data/gallery/2014-the-house-of-bruar.yml b/_data/gallery/2014-the-house-of-bruar.yml
new file mode 100644
index 0000000..64697c4
--- /dev/null
+++ b/_data/gallery/2014-the-house-of-bruar.yml
@@ -0,0 +1,5 @@
+- 52fe749
+- bfe328a
+- 8aaba27
+- a707acb
+- 5d9fe3b
diff --git a/_data/gallery/2014-views.yml b/_data/gallery/2014-views.yml
new file mode 100644
index 0000000..9211dc1
--- /dev/null
+++ b/_data/gallery/2014-views.yml
@@ -0,0 +1,5 @@
+- d000a9a
+- 2df93aa
+- 318c64f
+- 906cc7f
+- 7915f62
diff --git a/_data/gallery/2014-waterfall.yml b/_data/gallery/2014-waterfall.yml
new file mode 100644
index 0000000..3e88580
--- /dev/null
+++ b/_data/gallery/2014-waterfall.yml
@@ -0,0 +1,23 @@
+- af50b2c
+- 3e7b9cd
+- 4b0bb72
+- ec15335
+- c53ec0d
+- 2e0767e
+- 97f08bc
+- 90845b2
+- d170416
+- 313fd29
+- d8712ae
+- 2cddc0c
+- 6325e87
+- 3e3bf20
+- d04b245
+- 679b26a
+- 1ce7743
+- 5a327dc
+- 3ab2ee1
+- 288d0ff
+- 47b36af
+- b1e4e52
+- f5aa1fb
diff --git a/_data/gallery/2014-whisky-tasting-1.yml b/_data/gallery/2014-whisky-tasting-1.yml
new file mode 100644
index 0000000..70a6010
--- /dev/null
+++ b/_data/gallery/2014-whisky-tasting-1.yml
@@ -0,0 +1 @@
+- 41e61bc
diff --git a/_data/gallery/2014-whisky-tasting-2.yml b/_data/gallery/2014-whisky-tasting-2.yml
new file mode 100644
index 0000000..13320e8
--- /dev/null
+++ b/_data/gallery/2014-whisky-tasting-2.yml
@@ -0,0 +1,6 @@
+- 1551ea0
+- 7e902cd
+- cd53c7b
+- 0a050ed
+- ec3e367
+- f22d317
diff --git a/_data/gallery/2014-whisky-tasting.yml b/_data/gallery/2014-whisky-tasting.yml
new file mode 100644
index 0000000..1491718
--- /dev/null
+++ b/_data/gallery/2014-whisky-tasting.yml
@@ -0,0 +1,4 @@
+- 598c7ff
+- cd86d2d
+- 6ef0a46
+- 316804e
diff --git a/_data/gallery/2015-autumn-holidays.yml b/_data/gallery/2015-autumn-holidays.yml
new file mode 100644
index 0000000..1dbea44
--- /dev/null
+++ b/_data/gallery/2015-autumn-holidays.yml
@@ -0,0 +1,50 @@
+- 954e4fb
+- aa4f363
+- e3f8eba
+- bc098cd
+- 1665e59
+- 1766bea
+- d43ff62
+- 44d3ba9
+- c9cd3f6
+- 8f1ba2d
+- 923ca41
+- d028121
+- 1283f2e
+- 061bd47
+- da7f18a
+- 17f3471
+- 1e5184e
+- bd4f7fc
+- 7e0ca61
+- a288da0
+- 677ee74
+- 24118eb
+- b383b43
+- cf5af88
+- e905b5d
+- cd61d1e
+- dcfa233
+- 5d1cc2a
+- 04dc1e4
+- 3519ab6
+- 4ca3b77
+- 49b1e81
+- e768b76
+- 4e9d026
+- cbbdd30
+- 368ba23
+- fac7c5d
+- 0138770
+- c601f0f
+- 63974db
+- fbed02a
+- d82255d
+- 0e17e5c
+- 61f4659
+- 9a5d8f5
+- 32f7d1d
+- d0a51f7
+- 731476e
+- 3395610
+- 138b512
diff --git a/_data/gallery/2015-autumn-runs.yml b/_data/gallery/2015-autumn-runs.yml
new file mode 100644
index 0000000..9b0c597
--- /dev/null
+++ b/_data/gallery/2015-autumn-runs.yml
@@ -0,0 +1 @@
+- fb7e1d4
diff --git a/_data/gallery/2015-birthday-holidays.yml b/_data/gallery/2015-birthday-holidays.yml
new file mode 100644
index 0000000..4cfca92
--- /dev/null
+++ b/_data/gallery/2015-birthday-holidays.yml
@@ -0,0 +1 @@
+- 315dacc
diff --git a/_data/gallery/2015-botanical-garden.yml b/_data/gallery/2015-botanical-garden.yml
new file mode 100644
index 0000000..283c064
--- /dev/null
+++ b/_data/gallery/2015-botanical-garden.yml
@@ -0,0 +1,17 @@
+- c8f389f
+- b579925
+- 32cd62d
+- 156e2b6
+- e295956
+- 029ed5f
+- b256162
+- 8789c16
+- a60f94d
+- 7e47922
+- 2c67c85
+- 1ef28a5
+- 4561d65
+- 9733a5b
+- a61a2ee
+- ca7e7a5
+- 9560dd0
diff --git a/_data/gallery/2015-christmas-holidays-beach.yml b/_data/gallery/2015-christmas-holidays-beach.yml
new file mode 100644
index 0000000..91d612e
--- /dev/null
+++ b/_data/gallery/2015-christmas-holidays-beach.yml
@@ -0,0 +1,5 @@
+- 1c46802
+- bd4d3a0
+- 234b994
+- 8973bb6
+- de3417f
diff --git a/_data/gallery/2015-christmas-holidays-dwingelderveld.yml b/_data/gallery/2015-christmas-holidays-dwingelderveld.yml
new file mode 100644
index 0000000..7ff6448
--- /dev/null
+++ b/_data/gallery/2015-christmas-holidays-dwingelderveld.yml
@@ -0,0 +1,10 @@
+- 8eafdf9
+- cedffdd
+- 8fe9d47
+- 0a14a5a
+- f0c6532
+- e669a5a
+- 9eb032a
+- 248789d
+- 257c3ab
+- efb60c9
diff --git a/_data/gallery/2015-christmas-holidays-ikea.yml b/_data/gallery/2015-christmas-holidays-ikea.yml
new file mode 100644
index 0000000..a685e36
--- /dev/null
+++ b/_data/gallery/2015-christmas-holidays-ikea.yml
@@ -0,0 +1,3 @@
+- 1b49d18
+- d7c29bf
+- 9f338ab
diff --git a/_data/gallery/2015-christmas-holidays.yml b/_data/gallery/2015-christmas-holidays.yml
new file mode 100644
index 0000000..a870995
--- /dev/null
+++ b/_data/gallery/2015-christmas-holidays.yml
@@ -0,0 +1,47 @@
+- 9cc92e4
+- 378a0ec
+- 8a523c0
+- b90b43c
+- 1c8232d
+- 75afdba
+- 25959d9
+- 69c75ad
+- 4bc0aa0
+- 0093145
+- f43c4ec
+- debaa56
+- 886f250
+- fb24cf1
+- ebf3f19
+- b1f61e3
+- b924fdc
+- 81e32d1
+- 8bdfa44
+- b3f827b
+- 4c38747
+- b26ad08
+- ff33227
+- 41de2e7
+- 5636d6c
+- 698c477
+- a4d2bc2
+- d5a2cb9
+- 4012f4f
+- 0b7b3c0
+- 88ba775
+- 78d172f
+- 03a3cf4
+- 3e37348
+- 449d094
+- cd4ef4a
+- db4e423
+- 3435f20
+- a3a777c
+- 84190a0
+- 0ca40f2
+- 91c9241
+- b088e59
+- 5e66500
+- cdaa3b4
+- 46504d6
+- 76a9939
diff --git a/_data/gallery/2015-coastal-path.yml b/_data/gallery/2015-coastal-path.yml
new file mode 100644
index 0000000..5674c13
--- /dev/null
+++ b/_data/gallery/2015-coastal-path.yml
@@ -0,0 +1,27 @@
+- 5d54754
+- d56aac5
+- 7ca003c
+- 5812954
+- f27a020
+- 47a644a
+- 37e95ec
+- 995ab3e
+- ad5058e
+- 0b83b43
+- 9e8c3c5
+- 97f4b34
+- cb8de14
+- fa5edd3
+- 7cbe71e
+- dc64be0
+- 6a565da
+- 1bacc31
+- cb5ee4b
+- f72dce0
+- 5a8313a
+- ae75771
+- cc317c6
+- d0eec75
+- afc5007
+- a1dea1f
+- 5a8040f
diff --git a/_data/gallery/2015-geneva-history-museum.yml b/_data/gallery/2015-geneva-history-museum.yml
new file mode 100644
index 0000000..be93a75
--- /dev/null
+++ b/_data/gallery/2015-geneva-history-museum.yml
@@ -0,0 +1,16 @@
+- e3550a4
+- edee5ba
+- 18c2c97
+- c14f59b
+- dd27cb6
+- 6ede0ab
+- 6844d40
+- 45e3d39
+- b14be20
+- 076247f
+- aed9115
+- c1855ee
+- 9b5018d
+- 74174b3
+- bedf679
+- 44bf55d
diff --git a/_data/gallery/2015-geneva-maison-tavel.yml b/_data/gallery/2015-geneva-maison-tavel.yml
new file mode 100644
index 0000000..b622140
--- /dev/null
+++ b/_data/gallery/2015-geneva-maison-tavel.yml
@@ -0,0 +1,14 @@
+- 0eb2b01
+- 21fef3d
+- ac1d5cc
+- 7e54fbf
+- 1ff829a
+- be6e331
+- 013b9d2
+- a421a44
+- 733849f
+- c356e5e
+- 7d4f4c7
+- 30417b6
+- 4ff2bdf
+- de97857
diff --git a/_data/gallery/2015-geneva.yml b/_data/gallery/2015-geneva.yml
new file mode 100644
index 0000000..d6f093a
--- /dev/null
+++ b/_data/gallery/2015-geneva.yml
@@ -0,0 +1,14 @@
+- 207d988
+- 5d6f480
+- 899fbb2
+- 5e95b89
+- eb22ad6
+- 633d339
+- 7450027
+- 759399b
+- d316aab
+- f11fbcf
+- 02e7b3d
+- 51441d6
+- 5e3adb8
+- a1ac979
diff --git a/_data/gallery/2015-glen-clova-david.yml b/_data/gallery/2015-glen-clova-david.yml
new file mode 100644
index 0000000..4c91ab0
--- /dev/null
+++ b/_data/gallery/2015-glen-clova-david.yml
@@ -0,0 +1,2 @@
+- f062567
+- f92cb12
diff --git a/_data/gallery/2015-glen-clova.yml b/_data/gallery/2015-glen-clova.yml
new file mode 100644
index 0000000..4b7a59a
--- /dev/null
+++ b/_data/gallery/2015-glen-clova.yml
@@ -0,0 +1,36 @@
+- 49e5772
+- 43ddb97
+- d5d2647
+- 9090148
+- cdebcd4
+- c338648
+- 0de1ee2
+- f6708b9
+- 03c8746
+- 6e8e3ea
+- f9af05d
+- c6265e4
+- 6ececfd
+- 2ec11ae
+- 2b7b9a7
+- 6dd706c
+- 995abe1
+- 36c5105
+- 300c7e1
+- 8bdce1b
+- 09622f0
+- 9458403
+- e6651b4
+- ca520aa
+- e9d59f8
+- 3231f8e
+- 9810349
+- 8996cf6
+- a2ebd0c
+- 651e2a2
+- ec86082
+- 5388b77
+- c016041
+- 41169d3
+- 016d723
+- bd673ad
diff --git a/_data/gallery/2015-home-planting.yml b/_data/gallery/2015-home-planting.yml
new file mode 100644
index 0000000..63fe3b9
--- /dev/null
+++ b/_data/gallery/2015-home-planting.yml
@@ -0,0 +1,3 @@
+- f3abec0
+- 4e9ce9c
+- dbbd593
diff --git a/_data/gallery/2015-kingsbarns-distillery.yml b/_data/gallery/2015-kingsbarns-distillery.yml
new file mode 100644
index 0000000..2480c7c
--- /dev/null
+++ b/_data/gallery/2015-kingsbarns-distillery.yml
@@ -0,0 +1,9 @@
+- 76d76ed
+- 6d78d25
+- 754c91a
+- 83b96af
+- c09afdb
+- 908f32b
+- a0808fe
+- 6dbb83c
+- 98c799a
diff --git a/_data/gallery/2015-northen-ireland-belfast.yml b/_data/gallery/2015-northen-ireland-belfast.yml
new file mode 100644
index 0000000..ab6ef3f
--- /dev/null
+++ b/_data/gallery/2015-northen-ireland-belfast.yml
@@ -0,0 +1,36 @@
+- 989e196
+- e05d52c
+- 24d65ef
+- 0854894
+- a2ea4b9
+- f7e9499
+- 9ac173f
+- b9bc2f0
+- 80505ce
+- 8f5eeac
+- f736fd8
+- 11e4bd1
+- bc2b5ca
+- 877eb19
+- e3c212b
+- d45abe8
+- e465aa1
+- f57c1c6
+- aafd952
+- 9b828a3
+- af7d6d1
+- 0f3b551
+- c9b2717
+- 523b477
+- 7a9e956
+- ad3a529
+- d38c3b3
+- 85c9cb9
+- 9029196
+- 2bc7bd6
+- f9a4730
+- e36f253
+- 2640fdb
+- 7a7b560
+- 379c813
+- 9746153
diff --git a/_data/gallery/2015-northen-ireland-dark-hedges.yml b/_data/gallery/2015-northen-ireland-dark-hedges.yml
new file mode 100644
index 0000000..b778733
--- /dev/null
+++ b/_data/gallery/2015-northen-ireland-dark-hedges.yml
@@ -0,0 +1,2 @@
+- 496d2a0
+- f71d0d4
diff --git a/_data/gallery/2015-northen-ireland-giants-causeway.yml b/_data/gallery/2015-northen-ireland-giants-causeway.yml
new file mode 100644
index 0000000..44724eb
--- /dev/null
+++ b/_data/gallery/2015-northen-ireland-giants-causeway.yml
@@ -0,0 +1,19 @@
+- 1b3c5a9
+- e9d1ade
+- dc3545e
+- 0a3b080
+- db623be
+- dc3a457
+- 9a768e0
+- 5f0da78
+- 313eb3b
+- 960c76e
+- bed05dc
+- 548e3e3
+- 952ccb4
+- 77089c9
+- a9e526c
+- a600bd7
+- 144ed6a
+- f567812
+- 0fedd32
diff --git a/_data/gallery/2015-peugeot-206-fuel.yml b/_data/gallery/2015-peugeot-206-fuel.yml
new file mode 100644
index 0000000..22cfecd
--- /dev/null
+++ b/_data/gallery/2015-peugeot-206-fuel.yml
@@ -0,0 +1,2 @@
+- ad1de53
+- 390d4f5
diff --git a/_data/gallery/2015-peugeot-206.yml b/_data/gallery/2015-peugeot-206.yml
new file mode 100644
index 0000000..a084495
--- /dev/null
+++ b/_data/gallery/2015-peugeot-206.yml
@@ -0,0 +1,5 @@
+- 46ea247
+- 3592b0b
+- 11a3b22
+- 4cee1b3
+- 29bb256
diff --git a/_data/gallery/2015-renault-megane.yml b/_data/gallery/2015-renault-megane.yml
new file mode 100644
index 0000000..dbfa17d
--- /dev/null
+++ b/_data/gallery/2015-renault-megane.yml
@@ -0,0 +1,2 @@
+- 0272859
+- 9f0f9a2
diff --git a/_data/gallery/2015-round-the-houses.yml b/_data/gallery/2015-round-the-houses.yml
new file mode 100644
index 0000000..2c104c2
--- /dev/null
+++ b/_data/gallery/2015-round-the-houses.yml
@@ -0,0 +1 @@
+- f848391
diff --git a/_data/gallery/2015-seat-ibiza-heat-shield.yml b/_data/gallery/2015-seat-ibiza-heat-shield.yml
new file mode 100644
index 0000000..b545e5f
--- /dev/null
+++ b/_data/gallery/2015-seat-ibiza-heat-shield.yml
@@ -0,0 +1,4 @@
+- 64751cd
+- 3cb29a9
+- 64e4ca4
+- b607f9c
diff --git a/_data/gallery/2015-solar-eclipse.yml b/_data/gallery/2015-solar-eclipse.yml
new file mode 100644
index 0000000..69764c1
--- /dev/null
+++ b/_data/gallery/2015-solar-eclipse.yml
@@ -0,0 +1,7 @@
+- 59cce95
+- 84aefe5
+- 8576bbd
+- ed14c6b
+- a793eba
+- 1e22bf5
+- 95b98c7
diff --git a/_data/gallery/2015-spain-barcelona-stores.yml b/_data/gallery/2015-spain-barcelona-stores.yml
new file mode 100644
index 0000000..b140b55
--- /dev/null
+++ b/_data/gallery/2015-spain-barcelona-stores.yml
@@ -0,0 +1,14 @@
+- 3b2ca50
+- d1918cb
+- e39b91b
+- 2abe2ca
+- a964616
+- d1b8525
+- cae21ca
+- d3268a4
+- b286203
+- 901da28
+- a847e58
+- 414250a
+- 005de5b
+- 4bd050e
diff --git a/_data/gallery/2015-spain-barcelona.yml b/_data/gallery/2015-spain-barcelona.yml
new file mode 100644
index 0000000..c3eaade
--- /dev/null
+++ b/_data/gallery/2015-spain-barcelona.yml
@@ -0,0 +1,62 @@
+- 2447ff8
+- d1c6b11
+- e6dfaa0
+- cbcef0b
+- ba9b8b1
+- 73f0e2f
+- c9b37e9
+- fa8a15e
+- 74bae94
+- 6af62a9
+- a83cc73
+- ef5f142
+- 0ff38fa
+- 876a94a
+- a0926a5
+- 93f0866
+- 58363b4
+- fd07ffa
+- 55072cf
+- 31ee6d5
+- 0cb02ca
+- dabb533
+- 9efd424
+- 13cef07
+- a4ab746
+- b3745f7
+- 899b168
+- 8a21440
+- 92c630f
+- 59b913a
+- 2946b2a
+- 9215619
+- 2951a89
+- b53973e
+- 3c8b14a
+- ada4f8d
+- 6473afe
+- fe81da4
+- e4034d1
+- 0e77d58
+- 86ee230
+- c703796
+- 2fae95d
+- c36ef02
+- aea3e37
+- 993fd11
+- 60e86d3
+- dbd4a70
+- 27d585b
+- beccb64
+- 8a91e5b
+- 1005503
+- 7ec7b8e
+- 75b2f0f
+- 770ac89
+- a379c9e
+- 66e1ca2
+- 031f6b0
+- 0376a27
+- f2209d1
+- 892eb34
+- 1f6e81e
diff --git a/_data/gallery/2015-spain-portrait.yml b/_data/gallery/2015-spain-portrait.yml
new file mode 100644
index 0000000..2d957e8
--- /dev/null
+++ b/_data/gallery/2015-spain-portrait.yml
@@ -0,0 +1,3 @@
+- 4a34012
+- b7ed29e
+- 6904318
diff --git a/_data/gallery/2015-spain-sitges.yml b/_data/gallery/2015-spain-sitges.yml
new file mode 100644
index 0000000..59d3b4b
--- /dev/null
+++ b/_data/gallery/2015-spain-sitges.yml
@@ -0,0 +1,20 @@
+- 263f3b7
+- 4a7abd3
+- c102420
+- 0381192
+- 0605fba
+- fac0784
+- be2277a
+- 13215a0
+- 10b6e2d
+- 2b745a8
+- c9de3c2
+- dacd9dc
+- e945f15
+- 70ce4fd
+- 4348930
+- f57bbf7
+- cadb90d
+- 8d246e7
+- 3025085
+- d05ac75
diff --git a/_data/gallery/2015-spain-tarragona.yml b/_data/gallery/2015-spain-tarragona.yml
new file mode 100644
index 0000000..7ccf5c4
--- /dev/null
+++ b/_data/gallery/2015-spain-tarragona.yml
@@ -0,0 +1,4 @@
+- c2c8f99
+- 1422b9b
+- 5a4c1c4
+- ad9f802
diff --git a/_data/gallery/2015-summer-aberdeen-tolbooth.yml b/_data/gallery/2015-summer-aberdeen-tolbooth.yml
new file mode 100644
index 0000000..38c1458
--- /dev/null
+++ b/_data/gallery/2015-summer-aberdeen-tolbooth.yml
@@ -0,0 +1,5 @@
+- a581ec2
+- 4296a83
+- 09562d1
+- 1222a7a
+- 39df1f6
diff --git a/_data/gallery/2015-summer-aberdeen.yml b/_data/gallery/2015-summer-aberdeen.yml
new file mode 100644
index 0000000..5dda24e
--- /dev/null
+++ b/_data/gallery/2015-summer-aberdeen.yml
@@ -0,0 +1,7 @@
+- fa4baea
+- 942a1bb
+- 6fd482a
+- 28f9814
+- d85ad53
+- f5435e7
+- b9684a8
diff --git a/_data/gallery/2015-summer-dunnottar-castle.yml b/_data/gallery/2015-summer-dunnottar-castle.yml
new file mode 100644
index 0000000..7ea4a8e
--- /dev/null
+++ b/_data/gallery/2015-summer-dunnottar-castle.yml
@@ -0,0 +1,29 @@
+- 368a126
+- 7aecc50
+- a417923
+- 44dfad5
+- f5e4aa3
+- c986282
+- 61a3ec9
+- b653064
+- ce5f4e7
+- 795eed9
+- 493554a
+- cd95b03
+- 6bdb9dc
+- eb470d1
+- 92bafd2
+- dd3ae0d
+- dfe0c24
+- 70bbc21
+- a70ef2d
+- 0d68c24
+- a52bf7d
+- c507a24
+- 6e7bcae
+- 87a6832
+- 8d2966e
+- 7955e5f
+- b0cedd0
+- 514b8d5
+- 554a65a
diff --git a/_data/gallery/2015-summer-holidays.yml b/_data/gallery/2015-summer-holidays.yml
new file mode 100644
index 0000000..a192c80
--- /dev/null
+++ b/_data/gallery/2015-summer-holidays.yml
@@ -0,0 +1,13 @@
+- 5eb6abe
+- 5c66765
+- 381002b
+- 02207bd
+- ce3abd3
+- 87055e2
+- 612b54f
+- 3ed240c
+- 6032ca4
+- 16ac82b
+- eb1c684
+- 20037b3
+- 491fa55
diff --git a/_data/gallery/2015-visit-sanne-fife-anstruther.yml b/_data/gallery/2015-visit-sanne-fife-anstruther.yml
new file mode 100644
index 0000000..3af31d1
--- /dev/null
+++ b/_data/gallery/2015-visit-sanne-fife-anstruther.yml
@@ -0,0 +1,12 @@
+- 933253f
+- f659d36
+- 315c401
+- 74b5a76
+- 14a875b
+- bf429fe
+- 9ee6652
+- 7b54f72
+- 96ad329
+- 9e38769
+- 941f7f8
+- d24e161
diff --git a/_data/gallery/2015-visit-sanne-fife-pittenweem.yml b/_data/gallery/2015-visit-sanne-fife-pittenweem.yml
new file mode 100644
index 0000000..1adef4a
--- /dev/null
+++ b/_data/gallery/2015-visit-sanne-fife-pittenweem.yml
@@ -0,0 +1,13 @@
+- 97b3176
+- 03292ba
+- dbe3d72
+- a3562f0
+- a42e5b0
+- 621f0cb
+- 45a813c
+- 7365055
+- 522e4c2
+- fecb909
+- c168aac
+- 6613d83
+- 95c47af
diff --git a/_data/gallery/2015-visit-sanne-highlands-distillery.yml b/_data/gallery/2015-visit-sanne-highlands-distillery.yml
new file mode 100644
index 0000000..cf23c08
--- /dev/null
+++ b/_data/gallery/2015-visit-sanne-highlands-distillery.yml
@@ -0,0 +1,4 @@
+- 1702ed6
+- f7a6ad7
+- 2283a5c
+- 1bdf71a
diff --git a/_data/gallery/2015-visit-sanne-highlands-hike.yml b/_data/gallery/2015-visit-sanne-highlands-hike.yml
new file mode 100644
index 0000000..3cb7fd6
--- /dev/null
+++ b/_data/gallery/2015-visit-sanne-highlands-hike.yml
@@ -0,0 +1,18 @@
+- 7b382b1
+- 9d7a538
+- 61576ab
+- 9a24cc7
+- dbc55f0
+- 886bcc9
+- 0383a6f
+- 9b8f8ff
+- 0f184f6
+- 6561ee9
+- f3d85ec
+- 6941d68
+- 3bcccef
+- 5a165c6
+- 62dd57c
+- f04f202
+- d657fbe
+- 2ae039c
diff --git a/_data/gallery/2015-visit-sanne-highlands-perth.yml b/_data/gallery/2015-visit-sanne-highlands-perth.yml
new file mode 100644
index 0000000..c149cc7
--- /dev/null
+++ b/_data/gallery/2015-visit-sanne-highlands-perth.yml
@@ -0,0 +1,5 @@
+- b4aeee4
+- febc436
+- 38a287f
+- 770159b
+- 3851fc2
diff --git a/_data/gallery/2015-visit-sanne.yml b/_data/gallery/2015-visit-sanne.yml
new file mode 100644
index 0000000..7908e9e
--- /dev/null
+++ b/_data/gallery/2015-visit-sanne.yml
@@ -0,0 +1,5 @@
+- 2c802d3
+- 1016c64
+- 0b7862b
+- 1cc8ac2
+- 23135f6
diff --git a/_data/gallery/2015-whisky-poker.yml b/_data/gallery/2015-whisky-poker.yml
new file mode 100644
index 0000000..18de570
--- /dev/null
+++ b/_data/gallery/2015-whisky-poker.yml
@@ -0,0 +1,2 @@
+- ca11f73
+- 12f6e38
diff --git a/_data/gallery/2016-peugeot-206-leak.yml b/_data/gallery/2016-peugeot-206-leak.yml
new file mode 100644
index 0000000..1e6f656
--- /dev/null
+++ b/_data/gallery/2016-peugeot-206-leak.yml
@@ -0,0 +1 @@
+- 3c7d11d
diff --git a/_data/gallery/2016-seat-ibiza-scrap.yml b/_data/gallery/2016-seat-ibiza-scrap.yml
new file mode 100644
index 0000000..481327d
--- /dev/null
+++ b/_data/gallery/2016-seat-ibiza-scrap.yml
@@ -0,0 +1,5 @@
+- 4fda888
+- eea3ae1
+- e5811cb
+- 924e739
+- f3b37f7
diff --git a/_includes/gallery-list.html b/_includes/gallery-list.html
index d2bf10f..99e1b99 100644
--- a/_includes/gallery-list.html
+++ b/_includes/gallery-list.html
@@ -1,11 +1,10 @@
 <div class="list-gallery">
-{% for p in site.pages %}
-    {% if p.layout == 'gallery-photo' and p.gallery == gallery %}
+{% include gallery-photos.html %}
+{% for photo in photos %}
     <span itemprop="image" itemscope itemtype="http://schema.org/Photograph">
-        <a href="/{{ site.baseurl }}/{{ p.url }}" itemprop="url">
-            <img alt="Photo: {{ p.title }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ gallery }}/{{ p.name | remove:'.md' }}~200x200.jpg" title="{{ p.title }}" width="200" />
+        <a href="/{{ site.baseurl }}/{{ photo.url }}" itemprop="url">
+            <img alt="Photo: {{ photo.title }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ gallery }}/{{ photo.name | remove:'.md' }}~200x200.jpg" title="{{ photo.title }}" width="200" />
         </a>
     </span>
-    {% endif %}
 {% endfor %}
 </div>
diff --git a/_includes/gallery-photos.html b/_includes/gallery-photos.html
new file mode 100644
index 0000000..f059184
--- /dev/null
+++ b/_includes/gallery-photos.html
@@ -0,0 +1,9 @@
+{% capture baseurl %}{{ sitebaseurl }}/gallery/{{ include.gallery }}{% endcapture %}
+{% assign baseurl=baseurl | replace_first:'./','/' %}
+{% assign names=site.data.gallery[include.gallery] %}
+{% assign photos=site.array %}
+{% for name in names %}
+    {% capture url %}{{ baseurl }}/{{ name }}.html{% endcapture %}
+    {% assign_page photo=url %}
+    {% assign photos=photos | push:photo %}
+{% endfor %}
\ No newline at end of file
diff --git a/_layouts/gallery-map.html b/_layouts/gallery-map.html
index d23b341..496082b 100644
--- a/_layouts/gallery-map.html
+++ b/_layouts/gallery-map.html
@@ -19,18 +19,18 @@ layout: post
                     zoom : {{ page.map.zoom }}
                 }
             );
-            {% for p in site.pages %}
-                {% if p.layout == 'gallery-photo' and p.gallery == page.gallery %}
-                    {% if p.location %}
+{% include gallery-photos.html gallery=page.gallery %}
+{% for photo in photos %}
+    {% if photo.location %}
                 (function () {
                     var wo = false;
                     var m = new google.maps.Marker({
-                        position: new google.maps.LatLng({{ p.location.latitude }}, {{ p.location.longitude }}),
+                        position: new google.maps.LatLng({{ photo.location.latitude }}, {{ photo.location.longitude }}),
                         map : map,
-                        title : "{{ p.title }}"
+                        title : "{{ photo.title }}"
                     });
                     var w = new google.maps.InfoWindow({
-                        content: '<div style="margin-bottom:5px;">{{ p.title|replace:"'","\\'" }}</div><a href="/{{ site.baseurl }}/{{ p.url }}"><img alt="Photo: {{ p.title | replace:"'","\\'" }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ p.name | remove:'.md' }}~200x200.jpg" title="{{ p.title|replace:"'","\\'" }}" width="200" /></a>'
+                        content: '<div style="margin-bottom:5px;">{{ photo.title|replace:"'","\\'" }}</div><a href="/{{ site.baseurl }}/{{ photo.url }}"><img alt="Photo: {{ photo.title | replace:"'","\\'" }}" height="200" src="{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ photo.name | remove:'.md' }}~200x200.jpg" title="{{ photo.title|replace:"'","\\'" }}" width="200" /></a>'
                     });
                     google.maps.event.addListener(
                         m,
@@ -45,9 +45,8 @@ layout: post
                         }
                     );
                 })();
-                    {% endif %}
-                {% endif %}
-            {% endfor %}
+    {% endif %}
+{% endfor %}
         }
     );
 </script>
\ No newline at end of file
diff --git a/_layouts/gallery-slideshow.html b/_layouts/gallery-slideshow.html
index dc5a925..1ac6639 100644
--- a/_layouts/gallery-slideshow.html
+++ b/_layouts/gallery-slideshow.html
@@ -43,24 +43,23 @@
   <body>
     <section>
       <h1>{{ page.title }}</h1>
-        {% for p in site.pages %}
-            {% if p.layout == 'gallery-photo' and p.gallery == page.gallery %}
+{% include gallery-photos.html gallery=page.gallery %}
+{% for photo in photos %}
       <div class="photo" style="border-radius:2px;display:inline-block;margin:4px;overflow:hidden;">
-                {% assign maxsize = 0 %}
-                {% assign maxref = false %}
-                {% for size in p.sizes %}
-                    {% if maxsize < size[1].height * size[1].width %}
-                        {% assign maxsize = size[1].height * size[1].width %}
-                        {% assign maxref = size %}
-                    {% endif %}
-                {% endfor %}
-        <a href="{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ p.name | remove:'.md' }}~{{ maxref[0] }}.jpg" data-size="{{ maxref[1].width }}x{{ maxref[1].height }}">
-            <img src="{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ p.name | remove:'.md' }}~200x200.jpg" height="100" alt="{{ p.title }}" width="100" data-size="200x200" />
-        </a>
-        <div class="caption" style="display:none;">{{ p.content }}</div>
-      </div>
+    {% assign maxsize = 0 %}
+    {% assign maxref = false %}
+    {% for size in photo.sizes %}
+        {% if maxsize < size[1].height * size[1].width %}
+            {% assign maxsize = size[1].height * size[1].width %}
+            {% assign maxref = size %}
         {% endif %}
     {% endfor %}
+        <a href="{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ photo.name | remove:'.md' }}~{{ maxref[0] }}.jpg" data-size="{{ maxref[1].width }}x{{ maxref[1].height }}">
+            <img src="{{ site.asset_prefix }}/gallery/{{ page.gallery }}/{{ photo.name | remove:'.md' }}~200x200.jpg" height="100" alt="{{ photo.title }}" width="100" data-size="200x200" />
+        </a>
+        <div class="caption" style="display:none;">{{ photo.content }}</div>
+      </div>
+{% endfor %}
     </section>
       
       <!-- Root element of PhotoSwipe. Must have class pswp. -->
diff --git a/_plugins/assign_page.rb b/_plugins/assign_page.rb
new file mode 100644
index 0000000..b4b21bf
--- /dev/null
+++ b/_plugins/assign_page.rb
@@ -0,0 +1,30 @@
+# adapted from
+# - https://gist.githubusercontent.com/nathangrigg/7387238/raw/fdb229fb162a303cbd9a666de8be7d0aa3515cd6/assign_page.rb
+module Jekyll
+  module Tags
+    class AssignPage < Liquid::Assign
+      TrailingIndex = /index\.html$/
+
+      def page_hash(context)
+        reg = context.registers
+        site = reg[:site]
+        if reg[:page_hash].nil?
+          reg[:page_hash] = Hash[(site.posts.docs + site.pages).collect {
+            |x| [x.url.sub(TrailingIndex, ''), x]}]
+        end
+        return reg[:page_hash]
+      end
+
+      # Assign's Initializer stores variable name in @to and the value in @from.
+      def render(context)
+        url = @from.render(context)
+        page = page_hash(context)[url.sub(TrailingIndex, '')]
+        raise ArgumentError.new "No page with url #{url}." if page.nil?
+        context.scopes.last[@to] = page
+        return
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('assign_page', Jekyll::Tags::AssignPage)
\ No newline at end of file
diff --git a/_plugins/gallery.rb b/_plugins/gallery.rb
index 5778d13..f4ba347 100644
--- a/_plugins/gallery.rb
+++ b/_plugins/gallery.rb
@@ -9,7 +9,7 @@ module Jekyll
             self.data.merge!( gallery.data)
             self.data['gallery'] = gallery.url.split('/')[2]
             self.data['layout'] = 'gallery-' + layout
-        end        
+        end
     end
 
     class GalleryPageGenerator < Generator
diff --git a/_scripts/convert-galleries.php b/_scripts/convert-galleries.php
index 5563c44..c0e1d39 100644
--- a/_scripts/convert-galleries.php
+++ b/_scripts/convert-galleries.php
@@ -3,80 +3,41 @@ require __DIR__ . '/../_php/autoload.php';
 
 use Symfony\Component\Yaml\Yaml;
 
-$sOriginalDir = '_gallery.orig';
 $sCollectionDir = '_gallery';
 $sGalleryDir = 'gallery';
+$sDataDir = '_data/gallery';
 
-if (!is_dir($sCollectionDir)) {
-   mkdir($sCollectionDir); 
-}
-if (!is_dir($sGalleryDir)) {
-    mkdir($sGalleryDir);
+if (!file_exists($sDataDir)) {
+    mkdir($sDataDir);
 }
 
-foreach (glob($sOriginalDir . '/*/index.html') as $sFile) {
-    $sBasename = basename($sFile, '.md');
-    $sGallery = basename(dirname($sFile));
+foreach (glob($sCollectionDir . '/*.md') as $sFile) {
+    $sGallery = basename($sFile, '.md');
     printf("%s..\n", $sGallery);
 
-    $sDir = sprintf('%s/%s', $sOriginalDir, $sGallery);
-    $sMapFile = sprintf('%s/map.html', $sDir);
-
     parseFile($sFile, $aYaml, $sContents);
-    if (strpos($sContents, 'gallery_list') !== false) {
-        $sContents = null;
-    }
-    $aYaml['date'] = date('Y-m-d', $aYaml['date']);
     if (strpos($aYaml['title'], ' ') !== false) {
         $aYaml['title'] = sprintf('"%s"', $aYaml['title']);
     }
+    $aYaml['date'] = date('Y-m-d', $aYaml['date']);
     if (isset($aYaml['end_date'])) {
         $aYaml['end_date'] = date('Y-m-d', $aYaml['end_date']);
     }
-    unset($aYaml['highlight_photo']);
-    unset($aYaml['layout']);
-    unset($aYaml['map']);
-    if (file_exists($sMapFile)) {
-        parseFile($sMapFile, $aMapYaml, $sContents);
-        if (isset($aMapYaml['gallery_map'])) {
-            $aYaml['map'] = $aMapYaml['gallery_map'];
-        }
-    }
-
-    $sCopyDir = sprintf('%s/%s', $sGalleryDir, $sGallery);
-    if (!file_exists($sCopyDir)) {
-        mkdir($sCopyDir);
-    }
-
-    $aYaml['photos'] = [];
     $aPhotos = [];
-    foreach (glob(sprintf('%s/*.md', $sDir)) as $sFile) {
-        $sName = basename($sFile, '.md');
+    foreach (glob(sprintf('%s/%s/*.md', $sGalleryDir, $sGallery)) as $sPhotoFile) {
+        $sName = basename($sPhotoFile, '.md');
         $aYaml['photos'][] = $sName;
-        $sTargetFile = sprintf('%s/%s.md', $sCopyDir, $sName);
-        parseFile($sFile, $aPhotoYaml, $sPhotoContents);
-        // unset($aPhotoYaml['name']);
-        if (isset($aPhotoYaml['exif'])) {
-            $aPhotoYaml = array_merge($aPhotoYaml, $aPhotoYaml['exif']);
-            unset($aPhotoYaml['exif']);
-        }
-        if (isset($aPhotoYaml['album'])) {
-            $aPhotoYaml['gallery'] = $aPhotoYaml['album'];            
-            unset($aPhotoYaml['album']);
-        }
+        parseFile($sPhotoFile, $aPhotoYaml);
         if (isset($aPhotoYaml['date'])) {
-            $aPhotoYaml['date'] = date('Y-m-d H:i:s', $aPhotoYaml['date']);
             $aPhotos[$aPhotoYaml['date']] = $sName;
         }
-        writeFile($sTargetFile, $aPhotoYaml, $sPhotoContents);
     }
     ksort($aPhotos);
-    // $aYaml['photos'] = array_values($aPhotos);
+    $sDataFile = sprintf('%s/%s.yml', $sDataDir, $sGallery);
+    $aYaml['highlight'] = sprintf('%07s', current($aPhotos));
+    file_put_contents($sDataFile, yamlDump(array_values($aPhotos)));
     unset($aYaml['photos']);
-    $aYaml['highlight'] = current($aPhotos);
-
-    $sIndexFile = sprintf('%s/%s.md', $sCollectionDir, $sGallery);
-    // writeFile($sIndexFile, $aYaml, $sContents);
+    writeFile($sFile, $aYaml, $sContents);
 }
 
 function parseFile($sFile, &$aYaml, &$sContents = null) {
diff --git a/test.html b/test.html
new file mode 100644
index 0000000..aac9f64
--- /dev/null
+++ b/test.html
@@ -0,0 +1,8 @@
+---
+---
+{% assign gallery='2013-dundee' %}
+{% include gallery-photos.html gallery=gallery %}
+
+{% for photo in photos %}
+    {{ photo.file }}
+{% endfor %}
\ No newline at end of file