diff --git a/_data/gallery/2013-dundee.yml b/_data/gallery/2013-dundee.yml
index f0f22d3..08147ac 100644
--- a/_data/gallery/2013-dundee.yml
+++ b/_data/gallery/2013-dundee.yml
@@ -13,7 +13,7 @@ photos:
     location:
       latitude: 56.460559833333
       longitude: -2.9703473888889
-    model: HTC One S
+    model: One S
     make: HTC
   ad2b297:
     aperture: f/2.0
@@ -23,5 +23,5 @@ photos:
     location:
       latitude: 56.46228025
       longitude: -2.9721526944444
-    model: HTC One S
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-edinburgh.yml b/_data/gallery/2013-edinburgh.yml
index ca1c375..d286c81 100644
--- a/_data/gallery/2013-edinburgh.yml
+++ b/_data/gallery/2013-edinburgh.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 55.951339694444
       longitude: -3.1880302222222
-    model: HTC One S
+    model: One S
     make: HTC
   b091e3f:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 55.953639972222
       longitude: -3.1900281666667
-    model: HTC One S
+    model: One S
     make: HTC
   80db970:
     aperture: f/2.0
@@ -34,11 +34,7 @@ photos:
     location:
       latitude: 55.952419277778
       longitude: -3.1926369444444
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   725d113:
     aperture: f/2.0
@@ -48,7 +44,7 @@ photos:
     location:
       latitude: 55.95218275
       longitude: -3.1937393888889
-    model: HTC One S
+    model: One S
     make: HTC
   1197f83:
     aperture: f/2.0
@@ -58,7 +54,7 @@ photos:
     location:
       latitude: 55.951953861111
       longitude: -3.1949460277778
-    model: HTC One S
+    model: One S
     make: HTC
   958772b:
     aperture: f/2.0
@@ -68,7 +64,7 @@ photos:
     location:
       latitude: 55.951671583333
       longitude: -3.1955525833333
-    model: HTC One S
+    model: One S
     make: HTC
   6d39d8f:
     aperture: f/2.0
@@ -78,7 +74,7 @@ photos:
     location:
       latitude: 55.951099388889
       longitude: -3.2023875555556
-    model: HTC One S
+    model: One S
     make: HTC
   f7a009b:
     aperture: f/2.0
@@ -88,11 +84,7 @@ photos:
     location:
       latitude: 55.952308638889
       longitude: -3.2032973611111
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   293521a:
     aperture: f/2.0
@@ -102,53 +94,49 @@ photos:
     location:
       latitude: 55.953102111111
       longitude: -3.200469
-    model: HTC One S
+    model: One S
     make: HTC
   e8d614b:
     aperture: f/2.0
     date: 2013-09-18 09:35:07
     exposure: 608/1000000
     file: IMAG0834
-    model: HTC One S
+    model: One S
     make: HTC
   1e7fe9e:
     aperture: f/2.0
     date: 2013-09-18 09:35:34
     exposure: 418/1000000
     file: IMAG0835
-    model: HTC One S
+    model: One S
     make: HTC
   1967c83:
     aperture: f/2.0
     date: 2013-09-18 09:37:36
     exposure: 684/1000000
     file: IMAG0836
-    model: HTC One S
+    model: One S
     make: HTC
   1150f6d:
     aperture: f/2.0
     date: 2013-09-18 09:43:06
     exposure: 723/1000000
     file: IMAG0839
-    model: HTC One S
+    model: One S
     make: HTC
   f7fcc6a:
     aperture: f/2.0
     date: 2013-09-18 09:44:09
     exposure: 589/1000000
     file: IMAG0840
-    model: HTC One S
+    model: One S
     make: HTC
   6237d8c:
     aperture: f/2.0
     date: 2013-09-18 09:44:35
     exposure: 1541/1000000
     file: IMAG0841
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   42f26ff:
     aperture: f/2.0
@@ -158,7 +146,7 @@ photos:
     location:
       latitude: 55.954353305556
       longitude: -3.1828176944444
-    model: HTC One S
+    model: One S
     make: HTC
   b282557:
     aperture: f/2.0
@@ -168,7 +156,7 @@ photos:
     location:
       latitude: 55.949768055556
       longitude: -3.1895143888889
-    model: HTC One S
+    model: One S
     make: HTC
   ed9f15f:
     aperture: f/2.0
@@ -178,7 +166,7 @@ photos:
     location:
       latitude: 55.949497222222
       longitude: -3.1923289166667
-    model: HTC One S
+    model: One S
     make: HTC
   82fe1cd:
     aperture: f/2.0
@@ -188,64 +176,56 @@ photos:
     location:
       latitude: 55.949443805556
       longitude: -3.1926545833333
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   a041855:
     aperture: f/2.0
     date: 2013-09-18 10:14:31
     exposure: 59992/1000000
     file: IMAG0847
-    model: HTC One S
+    model: One S
     make: HTC
   e78a2ea:
     aperture: f/2.0
     date: 2013-09-18 10:14:41
     exposure: 50003/1000000
     file: IMAG0848
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   5c8bc06:
     aperture: f/2.0
     date: 2013-09-18 11:06:47
     exposure: 1446/1000000
     file: IMAG0852
-    model: HTC One S
+    model: One S
     make: HTC
   0d8e788:
     aperture: f/2.0
     date: 2013-09-18 11:37:01
     exposure: 4604/1000000
     file: IMAG0853
-    model: HTC One S
+    model: One S
     make: HTC
   c395de3:
     aperture: f/2.0
     date: 2013-09-18 11:42:34
     exposure: 1274/1000000
     file: IMAG0854
-    model: HTC One S
+    model: One S
     make: HTC
   37c6ca8:
     aperture: f/2.0
     date: 2013-09-18 11:45:48
     exposure: 837/1000000
     file: IMAG0855
-    model: HTC One S
+    model: One S
     make: HTC
   931fc98:
     aperture: f/2.0
     date: 2013-09-18 11:55:56
     exposure: 1484/1000000
     file: IMAG0856
-    model: HTC One S
+    model: One S
     make: HTC
   0ac0e6b:
     aperture: f/2.0
@@ -255,28 +235,28 @@ photos:
     location:
       latitude: 55.947658527778
       longitude: -3.1980821944444
-    model: HTC One S
+    model: One S
     make: HTC
   af8ee50:
     aperture: f/2.0
     date: 2013-09-18 12:20:25
     exposure: 742/1000000
     file: IMAG0864
-    model: HTC One S
+    model: One S
     make: HTC
   69a7569:
     aperture: f/2.0
     date: 2013-09-18 12:23:43
     exposure: 1579/1000000
     file: IMAG0866
-    model: HTC One S
+    model: One S
     make: HTC
   c1e7287:
     aperture: f/2.0
     date: 2013-09-18 12:28:47
     exposure: 10008/1000000
     file: IMAG0867
-    model: HTC One S
+    model: One S
     make: HTC
   e0ef82c:
     aperture: f/2.0
@@ -286,14 +266,14 @@ photos:
     location:
       latitude: 55.947017666667
       longitude: -3.1912467222222
-    model: HTC One S
+    model: One S
     make: HTC
   721d526:
     aperture: f/2.0
     date: 2013-09-18 13:16:44
     exposure: 951/1000000
     file: IMAG0871
-    model: HTC One S
+    model: One S
     make: HTC
   516bb78:
     aperture: f/2.0
@@ -303,7 +283,7 @@ photos:
     location:
       latitude: 55.950668333333
       longitude: -3.1953000833333
-    model: HTC One S
+    model: One S
     make: HTC
   ce33533:
     aperture: f/2.0
@@ -313,11 +293,7 @@ photos:
     location:
       latitude: 55.950550055556
       longitude: -3.1909811388889
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   0b27ad7:
     aperture: f/2.0
@@ -327,7 +303,7 @@ photos:
     location:
       latitude: 55.950630166667
       longitude: -3.1843032777778
-    model: HTC One S
+    model: One S
     make: HTC
   a8cd357:
     aperture: f/2.0
@@ -337,14 +313,10 @@ photos:
     location:
       latitude: 55.951118444444
       longitude: -3.1844692222222
-    model: HTC One S
+    model: One S
     make: HTC
   c6408ed:
     date: 2013-12-07 17:55:47
     file: IMAG0837
-    model: HTC One S
-    sizes:
-      640w: { height: 131, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-guy-fawkes-bonfire.yml b/_data/gallery/2013-guy-fawkes-bonfire.yml
index b569bf8..4abbc8b 100644
--- a/_data/gallery/2013-guy-fawkes-bonfire.yml
+++ b/_data/gallery/2013-guy-fawkes-bonfire.yml
@@ -13,7 +13,7 @@ photos:
     location:
       latitude: 56.33441925
       longitude: -2.7800938888889
-    model: HTC One S
+    model: One S
     make: HTC
   b316a8f:
     aperture: f/2.0
@@ -23,5 +23,5 @@ photos:
     location:
       latitude: 56.519115444444
       longitude: -2.7098050277778
-    model: HTC One S
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-miscellaneous.yml b/_data/gallery/2013-miscellaneous.yml
index 16e7bed..359ef68 100644
--- a/_data/gallery/2013-miscellaneous.yml
+++ b/_data/gallery/2013-miscellaneous.yml
@@ -15,11 +15,9 @@ photos:
     location:
       latitude: 56.340229027778
       longitude: -2.7997049722222
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   db12a2f:
     aperture: f/2.0
     date: 2013-11-16 10:47:47
@@ -28,5 +26,5 @@ photos:
     location:
       latitude: 56.330989833333
       longitude: -2.8061346666667
-    model: HTC One S
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-school.yml b/_data/gallery/2013-school.yml
index d54e2eb..424ae0d 100644
--- a/_data/gallery/2013-school.yml
+++ b/_data/gallery/2013-school.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 56.34321975
       longitude: -2.8059895
-    model: HTC One S
+    model: One S
     make: HTC
   b43d43c:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.339515666667
       longitude: -2.80945325
-    model: HTC One S
+    model: One S
     make: HTC
   90f86ae:
     aperture: f/2.0
@@ -34,7 +34,7 @@ photos:
     location:
       latitude: 56.339664444444
       longitude: -2.8078863611111
-    model: HTC One S
+    model: One S
     make: HTC
   c6c7b38:
     aperture: f/2.0
@@ -44,7 +44,7 @@ photos:
     location:
       latitude: 56.341232277778
       longitude: -2.8098456666667
-    model: HTC One S
+    model: One S
     make: HTC
   bfb4534:
     aperture: f/2.0
@@ -54,5 +54,5 @@ photos:
     location:
       latitude: 56.340293861111
       longitude: -2.8115990277778
-    model: HTC One S
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-train.yml b/_data/gallery/2013-train.yml
index 9962ddf..db46a5f 100644
--- a/_data/gallery/2013-train.yml
+++ b/_data/gallery/2013-train.yml
@@ -11,7 +11,7 @@ photos:
     date: 2013-09-16 15:15:23
     exposure: 342/1000000
     file: IMAG0741
-    model: HTC One S
+    model: One S
     make: HTC
   aaea74b:
     aperture: f/2.0
@@ -21,7 +21,7 @@ photos:
     location:
       latitude: 56.008274055556
       longitude: -3.3925730833333
-    model: HTC One S
+    model: One S
     make: HTC
   4f57220:
     aperture: f/2.0
@@ -31,7 +31,7 @@ photos:
     location:
       latitude: 56.042312611111
       longitude: -3.3812694444444
-    model: HTC One S
+    model: One S
     make: HTC
   4e57ab8:
     aperture: f/2.0
@@ -41,7 +41,7 @@ photos:
     location:
       latitude: 56.051437361111
       longitude: -3.3243245833333
-    model: HTC One S
+    model: One S
     make: HTC
   1039d58:
     aperture: f/2.0
@@ -51,14 +51,14 @@ photos:
     location:
       latitude: 56.052070611111
       longitude: -3.3221861944444
-    model: HTC One S
+    model: One S
     make: HTC
   48a04c1:
     aperture: f/2.0
     date: 2013-09-16 15:29:36
     exposure: 570/1000000
     file: IMAG0753
-    model: HTC One S
+    model: One S
     make: HTC
   e6bba51:
     aperture: f/2.0
@@ -68,7 +68,7 @@ photos:
     location:
       latitude: 56.063465111111
       longitude: -3.1956093055556
-    model: HTC One S
+    model: One S
     make: HTC
   0492706:
     aperture: f/2.0
@@ -78,7 +78,7 @@ photos:
     location:
       latitude: 56.253021222222
       longitude: -3.14113925
-    model: HTC One S
+    model: One S
     make: HTC
   5778593:
     aperture: f/2.0
@@ -88,7 +88,7 @@ photos:
     location:
       latitude: 56.24360275
       longitude: -3.1428639722222
-    model: HTC One S
+    model: One S
     make: HTC
   d4b3d57:
     aperture: f/2.0
@@ -98,7 +98,7 @@ photos:
     location:
       latitude: 56.297859166667
       longitude: -3.1359820277778
-    model: HTC One S
+    model: One S
     make: HTC
   43d49b1:
     aperture: f/2.0
@@ -108,21 +108,21 @@ photos:
     location:
       latitude: 56.324962611111
       longitude: -2.9767050277778
-    model: HTC One S
+    model: One S
     make: HTC
   056d9e8:
     aperture: f/2.0
     date: 2013-09-17 15:51:42
     exposure: 2131/1000000
     file: IMAG0804
-    model: HTC One S
+    model: One S
     make: HTC
   7939955:
     aperture: f/2.0
     date: 2013-09-17 16:03:47
     exposure: 1997/1000000
     file: IMAG0805
-    model: HTC One S
+    model: One S
     make: HTC
   a299d7a:
     aperture: f/2.0
@@ -132,21 +132,21 @@ photos:
     location:
       latitude: 56.077747333333
       longitude: -3.1646559166667
-    model: HTC One S
+    model: One S
     make: HTC
   c1282dc:
     aperture: f/2.0
     date: 2013-09-17 16:24:04
     exposure: 627/1000000
     file: IMAG0809
-    model: HTC One S
+    model: One S
     make: HTC
   be138f3:
     aperture: f/2.0
     date: 2013-09-17 16:24:50
     exposure: 475/1000000
     file: IMAG0813
-    model: HTC One S
+    model: One S
     make: HTC
   d1e2e9c:
     aperture: f/2.0
@@ -156,7 +156,7 @@ photos:
     location:
       latitude: 56.008342722222
       longitude: -3.3923931111111
-    model: HTC One S
+    model: One S
     make: HTC
   ee2c537:
     aperture: f/2.0
@@ -166,5 +166,5 @@ photos:
     location:
       latitude: 56.005619027778
       longitude: -3.3910098055556
-    model: HTC One S
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-visit-bram.yml b/_data/gallery/2013-visit-bram.yml
index 37a3d92..b5b825c 100644
--- a/_data/gallery/2013-visit-bram.yml
+++ b/_data/gallery/2013-visit-bram.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 56.341995222222
       longitude: -2.7905196944444
-    model: HTC One S
+    model: One S
     make: HTC
   8205372:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.342605583333
       longitude: -2.7901866111111
-    model: HTC One S
+    model: One S
     make: HTC
   768b70c:
     aperture: f/2.0
@@ -34,7 +34,7 @@ photos:
     location:
       latitude: 56.342605583333
       longitude: -2.7901866111111
-    model: HTC One S
+    model: One S
     make: HTC
   f12a626:
     aperture: f/2.0
@@ -44,11 +44,7 @@ photos:
     location:
       latitude: 56.342449166667
       longitude: -2.7902364722222
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   a8e0b3a:
     aperture: f/2.0
@@ -58,11 +54,7 @@ photos:
     location:
       latitude: 56.342449166667
       longitude: -2.7902364722222
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   e1f0287:
     aperture: f/2.0
@@ -72,7 +64,7 @@ photos:
     location:
       latitude: 56.342525472222
       longitude: -2.790143
-    model: HTC One S
+    model: One S
     make: HTC
   f9756fb:
     aperture: f/2.0
@@ -82,7 +74,7 @@ photos:
     location:
       latitude: 56.341995222222
       longitude: -2.7896104166667
-    model: HTC One S
+    model: One S
     make: HTC
   21605c7:
     aperture: f/2.0
@@ -92,11 +84,7 @@ photos:
     location:
       latitude: 56.341888416667
       longitude: -2.7899937777778
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   b7cb4d9:
     aperture: f/2.0
@@ -106,7 +94,7 @@ photos:
     location:
       latitude: 56.342628472222
       longitude: -2.7902180833333
-    model: HTC One S
+    model: One S
     make: HTC
   5e860de:
     aperture: f/2.0
@@ -116,7 +104,7 @@ photos:
     location:
       latitude: 56.335369083333
       longitude: -2.79284425
-    model: HTC One S
+    model: One S
     make: HTC
   f5043b0:
     aperture: f/2.0
@@ -126,7 +114,7 @@ photos:
     location:
       latitude: 56.337562555556
       longitude: -2.7896001111111
-    model: HTC One S
+    model: One S
     make: HTC
   a9a7aea:
     aperture: f/2.0
@@ -136,11 +124,7 @@ photos:
     location:
       latitude: 56.341670972222
       longitude: -2.7945668333333
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   608307e:
     aperture: f/2.0
@@ -150,11 +134,7 @@ photos:
     location:
       latitude: 56.338729833333
       longitude: -2.79852625
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   4ae8e30:
     aperture: f/2.0
@@ -164,7 +144,7 @@ photos:
     location:
       latitude: 56.339473722222
       longitude: -2.7959859166667
-    model: HTC One S
+    model: One S
     make: HTC
   3d7f2be:
     aperture: f/2.0
@@ -174,11 +154,7 @@ photos:
     location:
       latitude: 56.3404045
       longitude: -2.7895367222222
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   86f09c0:
     aperture: f/2.0
@@ -188,11 +164,7 @@ photos:
     location:
       latitude: 56.340042111111
       longitude: -2.7869958611111
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   ffdbe2b:
     aperture: f/2.0
@@ -202,11 +174,7 @@ photos:
     location:
       latitude: 56.340106944444
       longitude: -2.7866892222222
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   0e378e6:
     aperture: f/2.0
@@ -216,11 +184,7 @@ photos:
     location:
       latitude: 56.340175611111
       longitude: -2.78666875
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   3c23fb2:
     aperture: f/2.0
@@ -230,7 +194,7 @@ photos:
     location:
       latitude: 56.339477527778
       longitude: -2.7857932777778
-    model: HTC One S
+    model: One S
     make: HTC
   aace0c4:
     aperture: f/2.0
@@ -240,11 +204,7 @@ photos:
     location:
       latitude: 56.339477527778
       longitude: -2.7857932777778
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   7f42f35:
     aperture: f/2.0
@@ -254,7 +214,7 @@ photos:
     location:
       latitude: 56.339076972222
       longitude: -2.7852954722222
-    model: HTC One S
+    model: One S
     make: HTC
   1d1bcc0:
     aperture: f/2.0
@@ -264,7 +224,7 @@ photos:
     location:
       latitude: 56.339160916667
       longitude: -2.7819237777778
-    model: HTC One S
+    model: One S
     make: HTC
   4e28fd9:
     aperture: f/2.0
@@ -274,11 +234,7 @@ photos:
     location:
       latitude: 56.339138027778
       longitude: -2.7816941388889
-    model: HTC One S
-    sizes:
-      640w: { height: 360, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   2302af0:
     aperture: f/2.0
@@ -288,11 +244,7 @@ photos:
     location:
       latitude: 56.339473722222
       longitude: -2.7794366111111
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   7caa5de:
     aperture: f/2.0
@@ -302,11 +254,7 @@ photos:
     location:
       latitude: 56.339397416667
       longitude: -2.7883894444444
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   9ae4341:
     aperture: f/2.0
@@ -316,7 +264,7 @@ photos:
     location:
       latitude: 56.340068805556
       longitude: -2.7894675555556
-    model: HTC One S
+    model: One S
     make: HTC
   44de54e:
     aperture: f/2.0
@@ -326,7 +274,7 @@ photos:
     location:
       latitude: 56.33956525
       longitude: -2.7889856944444
-    model: HTC One S
+    model: One S
     make: HTC
   d1a78f6:
     aperture: f/2.0
@@ -336,7 +284,7 @@ photos:
     location:
       latitude: 56.339443194444
       longitude: -2.79556325
-    model: HTC One S
+    model: One S
     make: HTC
   bbfd853:
     date: 2013-12-07 18:10:52
@@ -344,9 +292,5 @@ photos:
     location:
       latitude: 56.33956525
       longitude: -2.7889856944444
-    model: HTC One S
-    sizes:
-      640w: { height: 138, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-visit.yml b/_data/gallery/2013-visit.yml
index 2914d2b..d7bed04 100644
--- a/_data/gallery/2013-visit.yml
+++ b/_data/gallery/2013-visit.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 56.341812111111
       longitude: -2.807235
-    model: HTC One S
+    model: One S
     make: HTC
   7ed7cf3:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.340797416667
       longitude: -2.8105420833333
-    model: HTC One S
+    model: One S
     make: HTC
   6b6f576:
     aperture: f/2.0
@@ -34,7 +34,7 @@ photos:
     location:
       latitude: 56.340122222222
       longitude: -2.8120393611111
-    model: HTC One S
+    model: One S
     make: HTC
   cfadeb2:
     aperture: f/2.0
@@ -44,7 +44,7 @@ photos:
     location:
       latitude: 56.339309666667
       longitude: -2.8115431944444
-    model: HTC One S
+    model: One S
     make: HTC
   a30cd0f:
     aperture: f/2.0
@@ -54,28 +54,28 @@ photos:
     location:
       latitude: 56.339290611111
       longitude: -2.81134725
-    model: HTC One S
+    model: One S
     make: HTC
   c9b371d:
     aperture: f/2.0
     date: 2013-09-16 17:51:45
     exposure: 970/1000000
     file: IMAG0772
-    model: HTC One S
+    model: One S
     make: HTC
   103794c:
     aperture: f/2.0
     date: 2013-09-16 18:01:40
     exposure: 8790/1000000
     file: IMAG0773
-    model: HTC One S
+    model: One S
     make: HTC
   c0d7445:
     aperture: f/2.0
     date: 2013-09-16 18:02:14
     exposure: 2321/1000000
     file: IMAG0775
-    model: HTC One S
+    model: One S
     make: HTC
     description: "Zeer Schots: een vlag op de oude West Port van het centrum!"
   c13088c:
@@ -83,7 +83,7 @@ photos:
     date: 2013-09-16 18:03:42
     exposure: 10008/1000000
     file: IMAG0776
-    model: HTC One S
+    model: One S
     make: HTC
   9d31169:
     aperture: f/2.0
@@ -93,7 +93,7 @@ photos:
     location:
       latitude: 56.338813777778
       longitude: -2.7981493611111
-    model: HTC One S
+    model: One S
     make: HTC
   683c571:
     aperture: f/2.0
@@ -103,7 +103,7 @@ photos:
     location:
       latitude: 56.338821388889
       longitude: -2.7980105555556
-    model: HTC One S
+    model: One S
     make: HTC
   a4a5d80:
     aperture: f/2.0
@@ -113,28 +113,28 @@ photos:
     location:
       latitude: 56.338817583333
       longitude: -2.79800275
-    model: HTC One S
+    model: One S
     make: HTC
   e63edcb:
     aperture: f/2.0
     date: 2013-09-16 18:08:13
     exposure: 10008/1000000
     file: IMAG0780
-    model: HTC One S
+    model: One S
     make: HTC
   bd99fb2:
     aperture: f/2.0
     date: 2013-09-16 18:12:55
     exposure: 10008/1000000
     file: IMAG0784
-    model: HTC One S
+    model: One S
     make: HTC
   343d363:
     aperture: f/2.0
     date: 2013-09-16 18:14:16
     exposure: 1008/1000000
     file: IMAG0785
-    model: HTC One S
+    model: One S
     make: HTC
   5cfe58f:
     aperture: f/2.0
@@ -144,14 +144,14 @@ photos:
     location:
       latitude: 56.338558194444
       longitude: -2.7844781666667
-    model: HTC One S
+    model: One S
     make: HTC
   19358cd:
     aperture: f/2.0
     date: 2013-09-16 18:17:19
     exposure: 1484/1000000
     file: IMAG0787
-    model: HTC One S
+    model: One S
     make: HTC
   0b7fade:
     aperture: f/2.0
@@ -161,7 +161,7 @@ photos:
     location:
       latitude: 56.340015388889
       longitude: -2.785275
-    model: HTC One S
+    model: One S
     make: HTC
   ba90b47:
     aperture: f/2.0
@@ -171,7 +171,7 @@ photos:
     location:
       latitude: 56.340290055556
       longitude: -2.7868676388889
-    model: HTC One S
+    model: One S
     make: HTC
   c01b359:
     aperture: f/2.0
@@ -181,7 +181,7 @@ photos:
     location:
       latitude: 56.340324388889
       longitude: -2.7887635277778
-    model: HTC One S
+    model: One S
     make: HTC
   23f8e70:
     aperture: f/2.0
@@ -191,7 +191,7 @@ photos:
     location:
       latitude: 56.341464972222
       longitude: -2.7945286944444
-    model: HTC One S
+    model: One S
     make: HTC
   19f4216:
     aperture: f/2.0
@@ -201,7 +201,7 @@ photos:
     location:
       latitude: 56.34332275
       longitude: -2.7999722777778
-    model: HTC One S
+    model: One S
     make: HTC
   443a682:
     aperture: f/2.0
@@ -211,11 +211,7 @@ photos:
     location:
       latitude: 56.341873166667
       longitude: -2.7990315
-    model: HTC One S
-    sizes:
-      640w: { height: 1136, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   c485092:
     date: 2013-12-07 17:31:11
@@ -223,15 +219,11 @@ photos:
     location:
       latitude: 56.338966361111
       longitude: -2.7822115555556
-    model: HTC One S
-    sizes:
-      640w: { height: 116, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   b45414c:
     date: 2013-12-07 17:31:12
     file: IMAG0782
-    model: HTC One S
+    model: One S
     width: 1920
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-wallace-monument.yml b/_data/gallery/2013-wallace-monument.yml
index 655f30f..26a55a2 100644
--- a/_data/gallery/2013-wallace-monument.yml
+++ b/_data/gallery/2013-wallace-monument.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 56.136726361111
       longitude: -3.9236757777778
-    model: HTC One S
+    model: One S
     make: HTC
   a1a0910:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.138889305556
       longitude: -3.9180018611111
-    model: HTC One S
+    model: One S
     make: HTC
   b0b9d1d:
     aperture: f/2.0
@@ -34,7 +34,7 @@ photos:
     location:
       latitude: 56.138813
       longitude: -3.9183325277778
-    model: HTC One S
+    model: One S
     make: HTC
     description: De versieringen aan de linkerkant omhullen een stijle wenteltrap.
   8169e74:
@@ -45,7 +45,7 @@ photos:
     location:
       latitude: 56.138813
       longitude: -3.9183325277778
-    model: HTC One S
+    model: One S
     make: HTC
   235345e:
     aperture: f/2.0
@@ -55,11 +55,9 @@ photos:
     location:
       latitude: 56.134761805556
       longitude: -3.92839075
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   61fbf21:
     aperture: f/2.0
     date: 2013-11-23 14:15:56
@@ -68,11 +66,9 @@ photos:
     location:
       latitude: 56.140583027778
       longitude: -3.9217104444444
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   93e0eb2:
     aperture: f/2.0
     date: 2013-11-23 14:18:33
@@ -81,7 +77,7 @@ photos:
     location:
       latitude: 56.136726361111
       longitude: -3.9236757777778
-    model: HTC One S
+    model: One S
     make: HTC
   9ea8cce:
     aperture: f/2.0
@@ -91,11 +87,9 @@ photos:
     location:
       latitude: 56.136726361111
       longitude: -3.9236757777778
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   0943f2d:
     aperture: f/2.0
     date: 2013-11-23 14:23:00
@@ -104,7 +98,7 @@ photos:
     location:
       latitude: 56.136726361111
       longitude: -3.9236757777778
-    model: HTC One S
+    model: One S
     make: HTC
   f5b3016:
     aperture: f/2.0
@@ -114,11 +108,9 @@ photos:
     location:
       latitude: 56.138835888889
       longitude: -3.9176985833333
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   0743f54:
     aperture: f/2.0
     date: 2013-11-23 14:24:12
@@ -127,7 +119,7 @@ photos:
     location:
       latitude: 56.138835888889
       longitude: -3.9176985833333
-    model: HTC One S
+    model: One S
     make: HTC
   69e351f:
     aperture: f/2.0
@@ -137,7 +129,7 @@ photos:
     location:
       latitude: 56.138839694444
       longitude: -3.9177169722222
-    model: HTC One S
+    model: One S
     make: HTC
   85babff:
     aperture: f/2.0
@@ -147,7 +139,7 @@ photos:
     location:
       latitude: 56.138618444444
       longitude: -3.91728375
-    model: HTC One S
+    model: One S
     make: HTC
   6212a95:
     aperture: f/2.0
@@ -157,7 +149,7 @@ photos:
     location:
       latitude: 56.138828277778
       longitude: -3.9177844166667
-    model: HTC One S
+    model: One S
     make: HTC
   1b55538:
     aperture: f/2.0
@@ -167,7 +159,7 @@ photos:
     location:
       latitude: 56.138832083333
       longitude: -3.9177865833333
-    model: HTC One S
+    model: One S
     make: HTC
   8ad3fa1:
     aperture: f/2.0
@@ -177,7 +169,7 @@ photos:
     location:
       latitude: 56.138832083333
       longitude: -3.9177853888889
-    model: HTC One S
+    model: One S
     make: HTC
   e7e5f0a:
     aperture: f/2.0
@@ -187,7 +179,7 @@ photos:
     location:
       latitude: 56.138828277778
       longitude: -3.9177918611111
-    model: HTC One S
+    model: One S
     make: HTC
   eb508de:
     aperture: f/2.0
@@ -197,7 +189,7 @@ photos:
     location:
       latitude: 56.126480083333
       longitude: -3.862365
-    model: HTC One S
+    model: One S
     make: HTC
   3e9d9bf:
     aperture: f/2.0
@@ -207,7 +199,7 @@ photos:
     location:
       latitude: 56.138587944444
       longitude: -3.9185333055556
-    model: HTC One S
+    model: One S
     make: HTC
   d300e61:
     aperture: f/2.0
@@ -217,7 +209,7 @@ photos:
     location:
       latitude: 56.099262222222
       longitude: -3.9049639166667
-    model: HTC One S
+    model: One S
     make: HTC
   29e40e2:
     aperture: f/2.0
@@ -227,7 +219,7 @@ photos:
     location:
       latitude: 56.138820638889
       longitude: -3.9177651666667
-    model: HTC One S
+    model: One S
     make: HTC
   aa136aa:
     aperture: f/2.0
@@ -237,7 +229,7 @@ photos:
     location:
       latitude: 56.149364472222
       longitude: -3.7915742222222
-    model: HTC One S
+    model: One S
     make: HTC
   fa6cc75:
     aperture: f/2.0
@@ -247,7 +239,7 @@ photos:
     location:
       latitude: 56.134761805556
       longitude: -3.92839075
-    model: HTC One S
+    model: One S
     make: HTC
   eef3de8:
     aperture: f/2.0
@@ -257,7 +249,7 @@ photos:
     location:
       latitude: 56.131778694444
       longitude: -3.9520811666667
-    model: HTC One S
+    model: One S
     make: HTC
   ad6923d:
     aperture: f/2.0
@@ -267,7 +259,7 @@ photos:
     location:
       latitude: 56.138759611111
       longitude: -3.9177586666667
-    model: HTC One S
+    model: One S
     make: HTC
   71941f6:
     aperture: f/2.0
@@ -277,11 +269,9 @@ photos:
     location:
       latitude: 56.138759611111
       longitude: -3.9177586666667
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   b41e1c7:
     aperture: f/2.0
     date: 2013-11-23 15:04:02
@@ -290,12 +280,10 @@ photos:
     location:
       latitude: 56.138580305556
       longitude: -3.9180323888889
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
     description: De reïncarnatie van William Wallace moet menig tourist vermaken.
+    width: 200
   de3e87a:
     aperture: f/2.0
     date: 2013-11-23 15:04:40
@@ -304,7 +292,7 @@ photos:
     location:
       latitude: 56.137470222222
       longitude: -3.9466683611111
-    model: HTC One S
+    model: One S
     make: HTC
   57f512e:
     aperture: f/2.0
@@ -314,11 +302,9 @@ photos:
     location:
       latitude: 56.139171583333
       longitude: -3.9173898611111
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   f26e022:
     aperture: f/2.0
     date: 2013-11-23 15:09:36
@@ -327,7 +313,7 @@ photos:
     location:
       latitude: 56.136726361111
       longitude: -3.9236757777778
-    model: HTC One S
+    model: One S
     make: HTC
   8a1e9c0:
     aperture: f/2.0
@@ -337,7 +323,7 @@ photos:
     location:
       latitude: 56.1398735
       longitude: -3.9172818333333
-    model: HTC One S
+    model: One S
     make: HTC
   a0343f3:
     date: 2013-12-05 20:57:49
@@ -345,10 +331,7 @@ photos:
     location:
       latitude: 56.138820638889
       longitude: -3.9177946666667
-    model: HTC One S
-    sizes:
-      640w: { height: 141, width: 640 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   0f91213:
     date: 2013-12-05 20:57:51
@@ -356,9 +339,5 @@ photos:
     location:
       latitude: 56.138889305556
       longitude: -3.9180018611111
-    model: HTC One S
-    sizes:
-      640w: { height: 153, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2013-west-sands.yml b/_data/gallery/2013-west-sands.yml
index 2cb4226..223d752 100644
--- a/_data/gallery/2013-west-sands.yml
+++ b/_data/gallery/2013-west-sands.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 56.361629472222
       longitude: -2.81128475
-    model: HTC One S
+    model: One S
     make: HTC
   7379c1b:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.361236555556
       longitude: -2.8113779444444
-    model: HTC One S
+    model: One S
     make: HTC
   c909bb1:
     aperture: f/2.0
@@ -34,7 +34,7 @@ photos:
     location:
       latitude: 56.350193
       longitude: -2.82553125
-    model: HTC One S
+    model: One S
     make: HTC
   8a51bcd:
     aperture: f/2.0
@@ -44,7 +44,7 @@ photos:
     location:
       latitude: 56.349327083333
       longitude: -2.8075580555556
-    model: HTC One S
+    model: One S
     make: HTC
   4118462:
     date: 2013-12-05 21:04:19
@@ -52,9 +52,5 @@ photos:
     location:
       latitude: 56.361782055556
       longitude: -2.8115453611111
-    model: HTC One S
-    sizes:
-      640w: { height: 348, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-anstruther.yml b/_data/gallery/2014-anstruther.yml
index df779d3..c9d7578 100644
--- a/_data/gallery/2014-anstruther.yml
+++ b/_data/gallery/2014-anstruther.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.222850777778
       longitude: -2.7071737777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   48daa05:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.222850777778
       longitude: -2.7071737777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   1693cf9:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 56.222850777778
       longitude: -2.7071737777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   fe576f2:
     aperture: f/2.0
@@ -56,10 +44,6 @@ photos:
       latitude: 56.222850777778
       longitude: -2.7071737777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   77526de:
     aperture: f/2.0
@@ -70,10 +54,6 @@ photos:
       latitude: 56.222824083333
       longitude: -2.7020020555556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   e0513e6:
     aperture: f/2.0
@@ -84,10 +64,6 @@ photos:
       latitude: 56.222850777778
       longitude: -2.7071737777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   8fa9d31:
     aperture: f/2.0
@@ -98,10 +74,6 @@ photos:
       latitude: 56.222423527778
       longitude: -2.7043006111111
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   39bd8f9:
     aperture: f/2.0
@@ -112,10 +84,6 @@ photos:
       latitude: 56.222423527778
       longitude: -2.7043006111111
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   02066b2:
     aperture: f/2.0
@@ -126,10 +94,6 @@ photos:
       latitude: 56.054042805556
       longitude: -2.7174401388889
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   91fffe8:
     aperture: f/2.0
@@ -137,10 +101,6 @@ photos:
     exposure: 418/1000000
     file: IMG_20140518_135204
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   3f50593:
     aperture: f/2.0
@@ -151,10 +111,6 @@ photos:
       latitude: 56.222587583333
       longitude: -2.7086279444444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   e2de5ee:
     aperture: f/2.0
@@ -165,10 +121,6 @@ photos:
       latitude: 56.222587583333
       longitude: -2.7086279444444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   972539b:
     aperture: f/2.0
@@ -179,10 +131,6 @@ photos:
       latitude: 56.15800475
       longitude: -2.6860921111111
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   0d57902:
     aperture: f/2.0
@@ -193,10 +141,6 @@ photos:
       latitude: 56.222850777778
       longitude: -2.7071737777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   18503f4:
     aperture: f/2.0
@@ -207,18 +151,10 @@ photos:
       latitude: 56.222850777778
       longitude: -2.7071737777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   efe8ddd:
     date: 2014-05-19 08:34:32
     file: PANO_20140518_141508
     location:
       latitude: 55.639819444444
-      longitude: -0.68065833333333
-    sizes:
-      640w: { height: 122, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+      longitude: -0.68065833333333
\ No newline at end of file
diff --git a/_data/gallery/2014-autumn-holidays.yml b/_data/gallery/2014-autumn-holidays.yml
index 68689ee..0642746 100644
--- a/_data/gallery/2014-autumn-holidays.yml
+++ b/_data/gallery/2014-autumn-holidays.yml
@@ -10,222 +10,142 @@ photos:
     aperture: f/4.8
     date: 2014-09-19 19:43:43
     exposure: 1/180
-    file: SAM_6643.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6643
+    model: WB600
+    make: Samsung
   052c977:
     aperture: f/5.4
     date: 2014-09-20 17:42:48
     exposure: 1/500
-    file: SAM_6649.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6649
+    model: WB600
+    make: Samsung
   16812bd:
     aperture: f/4.2
     date: 2014-09-20 18:17:41
     exposure: 1/45
-    file: SAM_6652.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6652
+    model: WB600
+    make: Samsung
   df0c20a:
     aperture: f/3.4
     date: 2014-09-20 20:36:45
     exposure: 1/30
-    file: SAM_6653.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6653
+    model: WB600
+    make: Samsung
   cab8a06:
     aperture: f/3.4
     date: 2014-09-20 21:55:07
     exposure: 1/30
-    file: SAM_6656.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6656
+    model: WB600
+    make: Samsung
   6e73fdf:
     aperture: f/5.2
     date: 2014-09-21 13:21:15
     exposure: 1/350
-    file: SAM_6657.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6657
+    model: WB600
+    make: Samsung
   710d47e:
     aperture: f/3.8
     date: 2014-09-21 16:12:48
     exposure: 1/180
-    file: SAM_6659.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6659
+    model: WB600
+    make: Samsung
   a722baa:
     aperture: f/6.2
     date: 2014-09-21 17:39:12
     exposure: 1/180
-    file: SAM_6661.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6661
+    model: WB600
+    make: Samsung
   52feb3d:
     aperture: f/5.0
     date: 2014-09-21 17:44:34
     exposure: 1/350
-    file: SAM_6665.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6665
+    model: WB600
+    make: Samsung
   e7c1fbd:
     aperture: f/6.2
     date: 2014-09-21 17:45:55
     exposure: 1/250
-    file: SAM_6668.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6668
+    model: WB600
+    make: Samsung
   007b457:
     aperture: f/6.2
     date: 2014-09-21 17:50:37
     exposure: 1/250
-    file: SAM_6671.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6671
+    model: WB600
+    make: Samsung
   d0287c3:
     aperture: f/3.8
     date: 2014-09-21 18:32:37
     exposure: 1/90
-    file: SAM_6673.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6673
+    model: WB600
+    make: Samsung
   ba4a08f:
     aperture: f/4.4
     date: 2014-09-21 19:08:45
     exposure: 1/180
-    file: SAM_6676.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6676
+    model: WB600
+    make: Samsung
   72d7c7a:
     aperture: f/3.2
     date: 2014-09-21 20:43:35
     exposure: 1/30
-    file: SAM_6679.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6679
+    model: WB600
+    make: Samsung
   878cc7f:
     aperture: f/4.4
     date: 2014-09-21 20:44:52
     exposure: 1/45
-    file: SAM_6682.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6682
+    model: WB600
+    make: Samsung
   9fa2752:
     aperture: f/3.2
     date: 2014-09-21 21:20:12
     exposure: 1/8
-    file: SAM_6687.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6687
+    model: WB600
+    make: Samsung
   1bc3654:
     aperture: f/3.2
     date: 2014-09-21 21:29:52
     exposure: 1/30
-    file: SAM_6689.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6689
+    model: WB600
+    make: Samsung
   26c04b5:
     aperture: f/3.2
     date: 2014-09-21 22:48:20
     exposure: 1/6
-    file: SAM_6691.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6691
+    model: WB600
+    make: Samsung
   a6d53ee:
     aperture: f/3.4
     date: 2014-09-22 00:13:27
     exposure: 1/30
-    file: SAM_6692.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6692
+    model: WB600
+    make: Samsung
   6d95a7a:
     aperture: f/4.6
     date: 2014-09-22 10:59:32
     exposure: 1/250
-    file: SAM_6696.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6696
+    model: WB600
+    make: Samsung
   273c31d:
     aperture: f/2.0
     date: 2014-09-22 11:08:23
@@ -235,44 +155,28 @@ photos:
       latitude: 57.326648694444
       longitude: -4.4466228333333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   a840099:
     aperture: f/5.0
     date: 2014-09-22 11:29:51
     exposure: 1/500
-    file: SAM_6697.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6697
+    model: WB600
+    make: Samsung
   9730c66:
     aperture: f/6.0
     date: 2014-09-22 11:32:14
     exposure: 1/350
-    file: SAM_6699.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6699
+    model: WB600
+    make: Samsung
   0c67f08:
     aperture: f/4.6
     date: 2014-09-22 11:33:07
     exposure: 1/250
-    file: SAM_6703.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6703
+    model: WB600
+    make: Samsung
   a951a7b:
     aperture: f/2.0
     date: 2014-09-22 11:40:49
@@ -282,340 +186,216 @@ photos:
       latitude: 57.326648694444
       longitude: -4.4466228333333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d6db9d4:
     aperture: f/5.4
     date: 2014-09-22 12:28:07
     exposure: 1/500
-    file: SAM_6710.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6710
+    model: WB600
+    make: Samsung
   a9af5d4:
     aperture: f/6.2
     date: 2014-09-22 12:38:19
     exposure: 1/180
-    file: SAM_6718.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6718
+    model: WB600
+    make: Samsung
   927c3a8:
     aperture: f/5.4
     date: 2014-09-22 12:57:22
     exposure: 1/250
-    file: SAM_6719.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6719
+    model: WB600
+    make: Samsung
   4b529a1:
     aperture: f/4.6
     date: 2014-09-22 13:04:28
     exposure: 1/750
-    file: SAM_6720.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6720
+    model: WB600
+    make: Samsung
   555674e:
     aperture: f/6.0
     date: 2014-09-22 13:16:01
     exposure: 1/350
-    file: SAM_6722.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6722
+    model: WB600
+    make: Samsung
   469d03b:
     aperture: f/6.2
     date: 2014-09-22 13:39:49
     exposure: 1/350
-    file: SAM_6725.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6725
+    model: WB600
+    make: Samsung
   6fc490a:
     aperture: f/4.0
     date: 2014-09-22 14:10:58
     exposure: 1/180
-    file: SAM_6729.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6729
+    model: WB600
+    make: Samsung
   fe925f4:
     aperture: f/4.6
     date: 2014-09-22 14:50:40
     exposure: 1/250
-    file: SAM_6734.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6734
+    model: WB600
+    make: Samsung
   1c3fa29:
     aperture: f/5.4
     date: 2014-09-22 15:04:52
     exposure: 1/250
-    file: SAM_6740.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6740
+    model: WB600
+    make: Samsung
   acaca7f:
     aperture: f/3.4
     date: 2014-09-22 16:01:56
     exposure: 1/125
-    file: SAM_6744.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6744
+    model: WB600
+    make: Samsung
   c0bcc8e:
     aperture: f/3.2
     date: 2014-09-22 16:03:33
     exposure: 1/30
-    file: SAM_6746.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6746
+    model: WB600
+    make: Samsung
   870d07a:
     aperture: f/3.2
     date: 2014-09-22 16:08:07
     exposure: 1/90
-    file: SAM_6751.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6751
+    model: WB600
+    make: Samsung
   5911b26:
     aperture: f/3.4
     date: 2014-09-22 16:11:18
     exposure: 1/30
-    file: SAM_6755.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6755
+    model: WB600
+    make: Samsung
   07f6e87:
     aperture: f/3.2
     date: 2014-09-22 16:40:02
     exposure: 1/45
-    file: SAM_6758.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6758
+    model: WB600
+    make: Samsung
   1089445:
     aperture: f/4.6
     date: 2014-09-23 11:22:38
     exposure: 1/350
-    file: SAM_6763.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6763
+    model: WB600
+    make: Samsung
   dfd42ff:
     aperture: f/5.4
     date: 2014-09-23 11:33:26
     exposure: 1/180
-    file: SAM_6766.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6766
+    model: WB600
+    make: Samsung
   003b359:
     aperture: f/5.4
     date: 2014-09-23 12:31:46
     exposure: 1/180
-    file: SAM_6767.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6767
+    model: WB600
+    make: Samsung
   a07084b:
     aperture: f/3.4
     date: 2014-09-23 12:35:40
     exposure: 1/180
-    file: SAM_6769.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6769
+    model: WB600
+    make: Samsung
   eca06a5:
     aperture: f/5.6
     date: 2014-09-23 12:44:03
     exposure: 1/180
-    file: SAM_6773.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6773
+    model: WB600
+    make: Samsung
   cb9811d:
     aperture: f/4.0
     date: 2014-09-23 14:13:12
     exposure: 1/125
-    file: SAM_6775.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6775
+    model: WB600
+    make: Samsung
   829487c:
     aperture: f/3.4
     date: 2014-09-23 14:17:06
     exposure: 1/30
-    file: SAM_6777.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6777
+    model: WB600
+    make: Samsung
   e401063:
     aperture: f/5.2
     date: 2014-09-23 14:18:33
     exposure: 1/250
-    file: SAM_6779.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6779
+    model: WB600
+    make: Samsung
   81f9cb7:
     aperture: f/4.0
     date: 2014-09-23 14:19:17
     exposure: 1/125
-    file: SAM_6780.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6780
+    model: WB600
+    make: Samsung
   65383e6:
     aperture: f/5.0
     date: 2014-09-23 15:00:25
     exposure: 1/350
-    file: SAM_6781.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6781
+    model: WB600
+    make: Samsung
   f5cf077:
     aperture: f/3.4
     date: 2014-09-23 16:33:50
     exposure: 1/250
-    file: SAM_6782.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6782
+    model: WB600
+    make: Samsung
   926d1ae:
     aperture: f/3.2
     date: 2014-09-24 09:24:50
     exposure: 1/10
-    file: SAM_6788.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6788
+    model: WB600
+    make: Samsung
   fcec42b:
     aperture: f/4.6
     date: 2014-09-24 10:15:15
     exposure: 1/350
-    file: SAM_6792.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6792
+    model: WB600
+    make: Samsung
   5319a01:
     aperture: f/4.6
     date: 2014-09-24 10:20:58
     exposure: 1/250
-    file: SAM_6794.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6794
+    model: WB600
+    make: Samsung
   40b333e:
     aperture: f/4.2
     date: 2014-09-24 10:21:04
     exposure: 1/250
-    file: SAM_6795.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6795
+    model: WB600
+    make: Samsung
   0def998:
     aperture: f/2.0
     date: 2014-09-24 10:24:41
     exposure: 4471/1000000
     file: SAM_6796c
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   f6e3f64:
     aperture: f/2.0
@@ -623,10 +403,6 @@ photos:
     exposure: 5650/1000000
     file: SAM_6796b
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   1221550:
     aperture: f/2.0
@@ -634,404 +410,256 @@ photos:
     exposure: 1369/1000000
     file: SAM_6796a
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   98ae532:
     aperture: f/4.4
     date: 2014-09-24 10:36:52
     exposure: 1/60
-    file: SAM_6796.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6796
+    model: WB600
+    make: Samsung
   0bb3360:
     aperture: f/3.2
     date: 2014-09-24 10:48:38
     exposure: 1/60
-    file: SAM_6798.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6798
+    model: WB600
+    make: Samsung
   13f9ae0:
     aperture: f/3.8
     date: 2014-09-24 10:54:45
     exposure: 1/125
-    file: SAM_6799.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6799
+    model: WB600
+    make: Samsung
   ed6345d:
     aperture: f/3.4
     date: 2014-09-24 11:09:11
     exposure: 1/60
-    file: SAM_6801.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6801
+    model: WB600
+    make: Samsung
   3b61ab1:
     aperture: f/3.4
     date: 2014-09-24 11:22:55
     exposure: 1/90
-    file: SAM_6803.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6803
+    model: WB600
+    make: Samsung
   50bc372:
     aperture: f/4.2
     date: 2014-09-24 11:32:57
     exposure: 1/60
-    file: SAM_6809.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6809
+    model: WB600
+    make: Samsung
   a409a03:
     aperture: f/4.6
     date: 2014-09-24 11:51:25
     exposure: 1/500
-    file: SAM_6814.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6814
+    model: WB600
+    make: Samsung
   a8ffc68:
     aperture: f/4.0
     date: 2014-09-24 11:55:46
     exposure: 1/60
-    file: SAM_6816.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6816
+    model: WB600
+    make: Samsung
   30a3632:
     aperture: f/3.4
     date: 2014-09-24 12:11:52
     exposure: 1/250
-    file: SAM_6822.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6822
+    model: WB600
+    make: Samsung
   9bfcd72:
     aperture: f/4.6
     date: 2014-09-24 14:35:12
     exposure: 1/500
-    file: SAM_6823.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6823
+    model: WB600
+    make: Samsung
   eb47b23:
     aperture: f/4.6
     date: 2014-09-24 14:39:16
     exposure: 1/350
-    file: SAM_6824.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6824
+    model: WB600
+    make: Samsung
   f93058d:
     aperture: f/6.6
     date: 2014-09-24 15:26:30
     exposure: 1/750
-    file: SAM_6828.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6828
+    model: WB600
+    make: Samsung
   e11b765:
     aperture: f/4.6
     date: 2014-09-24 15:40:07
     exposure: 1/750
-    file: SAM_6833.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6833
+    model: WB600
+    make: Samsung
   438505c:
     aperture: f/5.4
     date: 2014-09-24 15:50:48
     exposure: 1/500
-    file: SAM_6835.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6835
+    model: WB600
+    make: Samsung
   69fe011:
     aperture: f/3.4
     date: 2014-09-24 20:18:15
     exposure: 1/180
-    file: SAM_6840.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6840
+    model: WB600
+    make: Samsung
   fc30a40:
     aperture: f/3.2
     date: 2014-09-24 21:19:48
     exposure: 1/6
-    file: SAM_6842.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6842
+    model: WB600
+    make: Samsung
   30c5f64:
     aperture: f/3.2
     date: 2014-09-25 08:46:34
     exposure: 1/30
-    file: SAM_6855.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6855
+    model: WB600
+    make: Samsung
   d56c12b:
     aperture: f/3.2
     date: 2014-09-25 09:34:59
     exposure: 1/30
-    file: SAM_6859.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6859
+    model: WB600
+    make: Samsung
   1890c3b:
     aperture: f/3.2
     date: 2014-09-25 10:23:09
     exposure: 1/90
-    file: SAM_6863.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6863
+    model: WB600
+    make: Samsung
   a94e4c1:
     aperture: f/4.2
     date: 2014-09-25 10:26:28
     exposure: 1/90
-    file: SAM_6864.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6864
+    model: WB600
+    make: Samsung
   a70bcd6:
     aperture: f/3.2
     date: 2014-09-25 10:37:00
     exposure: 1/30
-    file: SAM_6865.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6865
+    model: WB600
+    make: Samsung
   b3d791b:
     aperture: f/3.2
     date: 2014-09-25 10:44:42
     exposure: 1/250
-    file: SAM_6867.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6867
+    model: WB600
+    make: Samsung
   c854924:
     aperture: f/3.2
     date: 2014-09-25 10:46:14
     exposure: 1/250
-    file: SAM_6871.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6871
+    model: WB600
+    make: Samsung
   76c06b5:
     aperture: f/5.4
     date: 2014-09-25 10:48:04
     exposure: 1/125
-    file: SAM_6873.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6873
+    model: WB600
+    make: Samsung
   77f43fd:
     aperture: f/4.2
     date: 2014-09-25 10:49:19
     exposure: 1/125
-    file: SAM_6875.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6875
+    model: WB600
+    make: Samsung
   07d1fe0:
     aperture: f/4.6
     date: 2014-09-25 10:51:07
     exposure: 1/180
-    file: SAM_6876.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6876
+    model: WB600
+    make: Samsung
   c09c5d8:
     aperture: f/3.4
     date: 2014-09-25 11:00:48
     exposure: 1/125
-    file: SAM_6882.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6882
+    model: WB600
+    make: Samsung
   bf6d31c:
     aperture: f/3.2
     date: 2014-09-25 11:37:28
     exposure: 1/15
-    file: SAM_6883.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6883
+    model: WB600
+    make: Samsung
   b7ebd02:
     aperture: f/3.2
     date: 2014-09-25 11:38:19
     exposure: 1/6
-    file: SAM_6885.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6885
+    model: WB600
+    make: Samsung
   2e48cf1:
     aperture: f/3.2
     date: 2014-09-25 11:39:42
     exposure: 1/30
-    file: SAM_6888.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6888
+    model: WB600
+    make: Samsung
   e24a682:
     aperture: f/3.2
     date: 2014-09-25 11:46:12
     exposure: 1/30
-    file: SAM_6889.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6889
+    model: WB600
+    make: Samsung
   cce0212:
     aperture: f/3.2
     date: 2014-09-25 11:46:44
     exposure: 1/125
-    file: SAM_6890.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6890
+    model: WB600
+    make: Samsung
   de933c5:
     aperture: f/3.8
     date: 2014-09-25 11:49:15
     exposure: 1/125
-    file: SAM_6892.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6892
+    model: WB600
+    make: Samsung
   65cd2e4:
     aperture: f/5.0
     date: 2014-09-25 12:09:51
     exposure: 1/125
-    file: SAM_6896.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6896
+    model: WB600
+    make: Samsung
   a3ff0f8:
     aperture: f/5.4
     date: 2014-09-25 12:27:31
     exposure: 1/250
-    file: SAM_6899.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6899
+    model: WB600
+    make: Samsung
   330309e:
     aperture: f/4.2
     date: 2014-09-25 12:45:10
     exposure: 1/180
-    file: SAM_6902.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_6902
+    model: WB600
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2014-bike.yml b/_data/gallery/2014-bike.yml
index f42982d..2f3e51b 100644
--- a/_data/gallery/2014-bike.yml
+++ b/_data/gallery/2014-bike.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.330402361111
       longitude: -2.8099718055556
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2723e35:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.330387111111
       longitude: -2.8100693333333
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6f13c66:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 56.33032225
       longitude: -2.8096828333333
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2112cd6:
     aperture: f/2.0
@@ -56,8 +44,4 @@ photos:
       latitude: 56.330402361111
       longitude: -2.8101201111111
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-blair-atholl-distillery.yml b/_data/gallery/2014-blair-atholl-distillery.yml
index 1eb84c8..e709622 100644
--- a/_data/gallery/2014-blair-atholl-distillery.yml
+++ b/_data/gallery/2014-blair-atholl-distillery.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.693592055556
       longitude: -3.7202978055556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6cd3355:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.693592055556
       longitude: -3.7202978055556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   4b7b942:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 56.693592055556
       longitude: -3.7202978055556
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   1ba44c5:
     aperture: f/2.0
@@ -56,10 +44,6 @@ photos:
       latitude: 56.693592055556
       longitude: -3.7202978055556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   372e50a:
     aperture: f/2.0
@@ -70,41 +54,25 @@ photos:
       latitude: 56.693592055556
       longitude: -3.7202978055556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   9e5a0d8:
     aperture: f/5.0
     date: 2014-02-08 12:01:55
     exposure: 1/160
-    file: DSC00205.JPG
+    file: DSC00205
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   83947fd:
     aperture: f/3.5
     date: 2014-02-08 12:49:29
     exposure: 1/160
-    file: DSC00208.JPG
+    file: DSC00208
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   cc2e9c4:
     aperture: f/3.5
     date: 2014-02-08 13:56:01
     exposure: 1/60
-    file: DSC00215.JPG
+    file: DSC00215
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
\ No newline at end of file
+    make: Sony
\ No newline at end of file
diff --git a/_data/gallery/2014-christmas-holidays-dwingelderveld.yml b/_data/gallery/2014-christmas-holidays-dwingelderveld.yml
index 014ad1a..5daee71 100644
--- a/_data/gallery/2014-christmas-holidays-dwingelderveld.yml
+++ b/_data/gallery/2014-christmas-holidays-dwingelderveld.yml
@@ -19,7 +19,7 @@ photos:
       640w: { height: 855, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   8fe9d47:
     aperture: f/2.9
     date: 2014-12-31 13:14:35
@@ -29,11 +29,7 @@ photos:
       latitude: 52.81384275
       longitude: 6.4133958611111
     model: Nexus 5
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   0a14a5a:
     date: 2014-12-31 13:18:45
     file: IMG_20141231_131844
@@ -50,7 +46,7 @@ photos:
       640w: { height: 865, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   e669a5a:
     date: 2014-12-31 13:20:10
     file: 2014-12-31 13.20.10
@@ -62,7 +58,7 @@ photos:
       640w: { height: 99, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   9eb032a:
     aperture: f/2.4
     date: 2014-12-31 13:21:20
@@ -76,7 +72,7 @@ photos:
       640w: { height: 865, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   248789d:
     aperture: f/2.4
     date: 2014-12-31 13:25:00
@@ -90,7 +86,7 @@ photos:
       640w: { height: 865, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   257c3ab:
     aperture: f/2.4
     date: 2014-12-31 13:25:51
@@ -104,7 +100,7 @@ photos:
       640w: { height: 474, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   efb60c9:
     aperture: f/2.4
     date: 2014-12-31 13:26:32
@@ -118,4 +114,4 @@ photos:
       640w: { height: 474, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: LGE
\ No newline at end of file
+    make: LG
\ No newline at end of file
diff --git a/_data/gallery/2014-christmas-holidays-ikea.yml b/_data/gallery/2014-christmas-holidays-ikea.yml
index 6c578d8..b23b195 100644
--- a/_data/gallery/2014-christmas-holidays-ikea.yml
+++ b/_data/gallery/2014-christmas-holidays-ikea.yml
@@ -1,4 +1,4 @@
-title: christmas-holidays-2014-ikea
+title: Christmas Holidays - IKEA
 date: 2014-12-22
 end_date: 2014-12-23
 photos:
diff --git a/_data/gallery/2014-coastal-path.yml b/_data/gallery/2014-coastal-path.yml
index 4ed3800..8fbd634 100644
--- a/_data/gallery/2014-coastal-path.yml
+++ b/_data/gallery/2014-coastal-path.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.3320465
       longitude: -2.7802524444444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   754d0d7:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.332588194444
       longitude: -2.7777383055556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   c9ea3f3:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 56.331237777778
       longitude: -2.7694325555556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   b8be28e:
     aperture: f/2.0
@@ -56,10 +44,6 @@ photos:
       latitude: 56.33107375
       longitude: -2.7673642222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   5d36fbd:
     aperture: f/2.0
@@ -70,10 +54,6 @@ photos:
       latitude: 56.32827375
       longitude: -2.74225875
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   c2f1cbf:
     aperture: f/2.0
@@ -84,10 +64,6 @@ photos:
       latitude: 56.328186027778
       longitude: -2.7421054722222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   e33a96e:
     aperture: f/2.0
@@ -98,10 +74,6 @@ photos:
       latitude: 56.328186027778
       longitude: -2.7421054722222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   7b75179:
     aperture: f/2.0
@@ -112,10 +84,6 @@ photos:
       latitude: 56.330005638889
       longitude: -2.74763175
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   a335c56:
     aperture: f/2.0
@@ -126,18 +94,10 @@ photos:
       latitude: 56.330333694444
       longitude: -2.7478341944444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   658404b:
     date: 2014-05-04 16:09:06
     file: PANO_20140504_134656
     location:
       latitude: 56.330533333333
-      longitude: -2.7478555555556
-    sizes:
-      640w: { height: 146, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+      longitude: -2.7478555555556
\ No newline at end of file
diff --git a/_data/gallery/2014-conference-usic.yml b/_data/gallery/2014-conference-usic.yml
index 9f04dd8..f2b136c 100644
--- a/_data/gallery/2014-conference-usic.yml
+++ b/_data/gallery/2014-conference-usic.yml
@@ -7,8 +7,4 @@ photos:
     exposure: 1/30
     file: 2014-09-05 12.12.33
     model: Nexus 5
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: LGE
\ No newline at end of file
+    make: LG
\ No newline at end of file
diff --git a/_data/gallery/2014-cooking.yml b/_data/gallery/2014-cooking.yml
index 143e0a6..12c98e1 100644
--- a/_data/gallery/2014-cooking.yml
+++ b/_data/gallery/2014-cooking.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.330379472222
       longitude: -2.8101548888889
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2f25d67:
     aperture: f/2.0
@@ -28,8 +24,4 @@ photos:
       latitude: 56.332653027778
       longitude: -2.8102038055556
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-crail.yml b/_data/gallery/2014-crail.yml
index fee2d84..5ecd21a 100644
--- a/_data/gallery/2014-crail.yml
+++ b/_data/gallery/2014-crail.yml
@@ -11,10 +11,6 @@ photos:
     exposure: 913/1000000
     file: IMG_20140323_134213
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   ad799b8:
     aperture: f/2.0
@@ -25,10 +21,6 @@ photos:
       latitude: 56.262405388889
       longitude: -2.6253082777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   39f52a8:
     aperture: f/2.0
@@ -39,10 +31,6 @@ photos:
       latitude: 56.261478416667
       longitude: -2.6220915277778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   ee4ad28:
     aperture: f/2.0
@@ -53,10 +41,6 @@ photos:
       latitude: 56.261833166667
       longitude: -2.62193175
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d7f1b3c:
     aperture: f/2.0
@@ -67,10 +51,6 @@ photos:
       latitude: 56.260486583333
       longitude: -2.6214575277778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   a9e319d:
     aperture: f/2.0
@@ -81,10 +61,6 @@ photos:
       latitude: 56.260429361111
       longitude: -2.6212463333333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   de85af4:
     aperture: f/2.0
@@ -92,10 +68,6 @@ photos:
     exposure: 665/1000000
     file: IMG_20140323_140618
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d443c98:
     aperture: f/2.0
@@ -106,10 +78,6 @@ photos:
       latitude: 56.259178138889
       longitude: -2.6229040555556
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   a81aa3d:
     aperture: f/2.0
@@ -120,10 +88,6 @@ photos:
       latitude: 56.258728027778
       longitude: -2.6257386388889
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6de6bff:
     aperture: f/2.0
@@ -134,10 +98,6 @@ photos:
       latitude: 56.258201583333
       longitude: -2.6262288333333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   481c334:
     aperture: f/2.0
@@ -148,10 +108,6 @@ photos:
       latitude: 56.258205388889
       longitude: -2.6262314444444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   bf454c6:
     aperture: f/2.0
@@ -162,10 +118,6 @@ photos:
       latitude: 56.258239722222
       longitude: -2.6262602222222
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   bca9078:
     aperture: f/2.0
@@ -176,10 +128,6 @@ photos:
       latitude: 56.258529638889
       longitude: -2.6288544722222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   e494f68:
     aperture: f/2.0
@@ -190,10 +138,6 @@ photos:
       latitude: 56.258529638889
       longitude: -2.6288544722222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   de6b563:
     aperture: f/2.0
@@ -204,10 +148,6 @@ photos:
       latitude: 56.258529638889
       longitude: -2.6288544722222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   8f0ef0f:
     aperture: f/2.0
@@ -215,18 +155,10 @@ photos:
     exposure: 2454/1000000
     file: IMG_20140323_144438
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   252aac5:
     date: 2014-03-23 19:32:45
     file: PANO_20140323_134738
     location:
       latitude: 56.260486111111
-      longitude: -2.6214583333333
-    sizes:
-      640w: { height: 188, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+      longitude: -2.6214583333333
\ No newline at end of file
diff --git a/_data/gallery/2014-edinburgh.yml b/_data/gallery/2014-edinburgh.yml
index a301186..7d4965c 100644
--- a/_data/gallery/2014-edinburgh.yml
+++ b/_data/gallery/2014-edinburgh.yml
@@ -10,13 +10,9 @@ photos:
     aperture: f/13.0
     date: 2014-05-24 10:43:03
     exposure: 1/160
-    file: DSC00559.JPG
+    file: DSC00559
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   e00a4e9:
     aperture: f/2.0
     date: 2014-05-24 11:01:43
@@ -26,33 +22,21 @@ photos:
       latitude: 55.955028527778
       longitude: -3.2088765833333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   b19ebe8:
     aperture: f/11.0
     date: 2014-05-24 11:05:32
     exposure: 1/250
-    file: DSC00566.JPG
+    file: DSC00566
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   c79dacc:
     aperture: f/11.0
     date: 2014-05-24 11:09:24
     exposure: 1/125
-    file: DSC00568.JPG
+    file: DSC00568
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   f148b08:
     aperture: f/2.0
     date: 2014-05-24 11:12:39
@@ -62,22 +46,14 @@ photos:
       latitude: 55.955028527778
       longitude: -3.2088765833333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   b929a9f:
     aperture: f/16.0
     date: 2014-05-24 11:14:32
     exposure: 1/160
-    file: DSC00570.JPG
+    file: DSC00570
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   1370224:
     aperture: f/2.0
     date: 2014-05-24 11:18:07
@@ -87,10 +63,6 @@ photos:
       latitude: 55.94924925
       longitude: -3.1963937222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   0388f32:
     aperture: f/2.0
@@ -101,10 +73,6 @@ photos:
       latitude: 55.947105388889
       longitude: -3.1998350555556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   3f57b39:
     aperture: f/2.0
@@ -115,10 +83,6 @@ photos:
       latitude: 55.946826916667
       longitude: -3.1994335555556
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6f2d9ab:
     aperture: f/2.0
@@ -129,10 +93,6 @@ photos:
       latitude: 55.947666166667
       longitude: -3.1956903888889
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   65ad15a:
     aperture: f/2.0
@@ -143,77 +103,49 @@ photos:
       latitude: 55.950759861111
       longitude: -3.1952888888889
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   57da2ba:
     aperture: f/4.5
     date: 2014-05-24 12:06:17
     exposure: 1/160
-    file: DSC00583.JPG
+    file: DSC00583
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   1f51f1e:
     aperture: f/5.0
     date: 2014-05-24 12:16:25
     exposure: 1/160
-    file: DSC00584.JPG
+    file: DSC00584
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   2c936c9:
     aperture: f/4.0
     date: 2014-05-24 12:20:07
     exposure: 1/60
-    file: DSC00587.JPG
+    file: DSC00587
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   812f405:
     aperture: f/9.0
     date: 2014-05-24 12:31:02
     exposure: 1/250
-    file: DSC00588.JPG
+    file: DSC00588
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   f49943e:
     aperture: f/11.0
     date: 2014-05-24 13:00:12
     exposure: 1/400
-    file: DSC00590.JPG
+    file: DSC00590
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   7c22665:
     aperture: f/16.0
     date: 2014-05-24 13:00:46
     exposure: 1/200
-    file: DSC00591.JPG
+    file: DSC00591
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   5987a59:
     aperture: f/2.0
     date: 2014-05-24 14:18:19
@@ -223,22 +155,14 @@ photos:
       latitude: 55.953189833333
       longitude: -3.1913487777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2a70646:
     aperture: f/16.0
     date: 2014-05-24 14:22:56
     exposure: 1/125
-    file: DSC00597.JPG
+    file: DSC00597
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   fcfd3a8:
     aperture: f/2.0
     date: 2014-05-24 14:24:41
@@ -248,88 +172,56 @@ photos:
       latitude: 55.953189833333
       longitude: -3.1913487777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2bf500e:
     aperture: f/16.0
     date: 2014-05-24 14:27:06
     exposure: 1/125
-    file: DSC00598.JPG
+    file: DSC00598
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   0710494:
     aperture: f/2.0
     date: 2014-05-24 14:32:34
     exposure: 380/1000000
     file: IMG_20140524_143234
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   e6e40eb:
     aperture: f/16.0
     date: 2014-05-24 14:40:10
     exposure: 1/200
-    file: DSC00601.JPG
+    file: DSC00601
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   bb4fc94:
     aperture: f/16.0
     date: 2014-05-24 14:40:26
     exposure: 1/250
-    file: DSC00602.JPG
+    file: DSC00602
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   5db63ae:
     aperture: f/14.0
     date: 2014-05-24 14:41:02
     exposure: 1/200
-    file: DSC00603.JPG
+    file: DSC00603
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   b911be7:
     aperture: f/16.0
     date: 2014-05-24 14:41:27
     exposure: 1/125
-    file: DSC00604.JPG
+    file: DSC00604
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   8ce353a:
     aperture: f/6.3
     date: 2014-05-24 14:46:46
     exposure: 1/640
-    file: DSC00611.JPG
+    file: DSC00611
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   ebd1c3c:
     aperture: f/2.0
     date: 2014-05-24 15:04:49
@@ -339,10 +231,6 @@ photos:
       latitude: 55.957981083333
       longitude: -3.1738438333333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   67763b9:
     aperture: f/2.0
@@ -353,10 +241,6 @@ photos:
       latitude: 55.949623083333
       longitude: -3.1812178888889
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   60a1c09:
     aperture: f/2.0
@@ -367,10 +251,6 @@ photos:
       latitude: 55.942150111111
       longitude: -3.1865100833333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   0550a46:
     aperture: f/2.0
@@ -381,10 +261,6 @@ photos:
       latitude: 55.941761
       longitude: -3.1885201666667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2ee2acf:
     aperture: f/2.0
@@ -395,22 +271,14 @@ photos:
       latitude: 55.938869472222
       longitude: -3.1860783055556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   20ade53:
     aperture: f/16.0
     date: 2014-05-24 15:29:15
     exposure: 1/80
-    file: DSC00613.JPG
+    file: DSC00613
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   331f011:
     aperture: f/2.0
     date: 2014-05-24 15:34:09
@@ -420,66 +288,42 @@ photos:
       latitude: 55.933094
       longitude: -3.1811945277778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   eb933f6:
     aperture: f/14.0
     date: 2014-05-24 15:35:38
     exposure: 1/100
-    file: DSC00614.JPG
+    file: DSC00614
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   512383f:
     aperture: f/16.0
     date: 2014-05-24 15:44:49
     exposure: 1/60
-    file: DSC00618.JPG
+    file: DSC00618
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   fc09b90:
     aperture: f/11.0
     date: 2014-05-24 15:47:24
     exposure: 1/100
-    file: DSC00619.JPG
+    file: DSC00619
     model: NEX-3N
-    sizes:
-      640w: { height: 145, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   685af69:
     aperture: f/13.0
     date: 2014-05-24 15:47:56
     exposure: 1/60
-    file: DSC00620.JPG
+    file: DSC00620
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   000d525:
     aperture: f/16.0
     date: 2014-05-24 15:48:18
     exposure: 1/100
-    file: DSC00622.JPG
+    file: DSC00622
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   0cdd901:
     aperture: f/2.0
     date: 2014-05-24 15:53:41
@@ -489,22 +333,14 @@ photos:
       latitude: 55.941555
       longitude: -3.1809136666667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   0639559:
     aperture: f/16.0
     date: 2014-05-24 15:53:56
     exposure: 1/160
-    file: DSC00623.JPG
+    file: DSC00623
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   b319a77:
     aperture: f/2.0
     date: 2014-05-24 15:53:57
@@ -514,33 +350,21 @@ photos:
       latitude: 55.943019861111
       longitude: -3.1617941666667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   aa08d7e:
     aperture: f/16.0
     date: 2014-05-24 15:59:20
     exposure: 1/100
-    file: DSC00628.JPG
+    file: DSC00628
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   bf39987:
     aperture: f/16.0
     date: 2014-05-24 16:00:08
     exposure: 1/80
-    file: DSC00630.JPG
+    file: DSC00630
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   4576840:
     aperture: f/2.0
     date: 2014-05-24 16:00:26
@@ -550,33 +374,21 @@ photos:
       latitude: 55.943969722222
       longitude: -3.1619040833333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   dd99da8:
     aperture: f/14.0
     date: 2014-05-24 16:00:27
     exposure: 1/125
-    file: DSC00631.JPG
+    file: DSC00631
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   7f9fb15:
     aperture: f/16.0
     date: 2014-05-24 16:01:38
     exposure: 1/100
-    file: DSC00633.JPG
+    file: DSC00633
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   488dc2f:
     aperture: f/2.0
     date: 2014-05-24 16:02:54
@@ -586,10 +398,6 @@ photos:
       latitude: 55.944023111111
       longitude: -3.1618752222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   bac208c:
     aperture: f/2.0
@@ -600,33 +408,21 @@ photos:
       latitude: 55.943935388889
       longitude: -3.1620540555556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   706493f:
     aperture: f/5.0
     date: 2014-05-24 16:03:47
     exposure: 1/400
-    file: DSC00636.JPG
+    file: DSC00636
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   5f320ea:
     aperture: f/16.0
     date: 2014-05-24 16:04:11
     exposure: 1/80
-    file: DSC00637.JPG
+    file: DSC00637
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   97e79cd:
     aperture: f/2.0
     date: 2014-05-24 16:13:59
@@ -636,10 +432,6 @@ photos:
       latitude: 55.943935388889
       longitude: -3.1620399722222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   8ac90ed:
     aperture: f/2.0
@@ -650,10 +442,6 @@ photos:
       latitude: 55.943935388889
       longitude: -3.1620399722222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   5ba7755:
     aperture: f/2.0
@@ -664,37 +452,21 @@ photos:
       latitude: 55.942871083333
       longitude: -3.1858239166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   92c505e:
     aperture: f/14.0
     date: 2014-05-24 17:02:55
     exposure: 1/80
-    file: DSC00644.JPG
+    file: DSC00644
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   cf0a078:
     aperture: f/8.0
     date: 2014-05-24 18:57:02
     exposure: 1/100
-    file: DSC00648.JPG
+    file: DSC00648
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   df40ee2:
     date: 2014-05-25 13:09:44
-    file: PANO_20140524_152048
-    sizes:
-      640w: { height: 170, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+    file: PANO_20140524_152048
\ No newline at end of file
diff --git a/_data/gallery/2014-fife.yml b/_data/gallery/2014-fife.yml
index 4106cd3..5ecf846 100644
--- a/_data/gallery/2014-fife.yml
+++ b/_data/gallery/2014-fife.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.118118277778
       longitude: -3.1446185
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   f3fac4b:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.111400583333
       longitude: -3.1580073611111
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   872614c:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 56.253551472222
       longitude: -3.2067601666667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   41494b3:
     aperture: f/2.0
@@ -56,10 +44,6 @@ photos:
       latitude: 56.253578166667
       longitude: -3.2066712222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   1465670:
     aperture: f/2.0
@@ -70,10 +54,6 @@ photos:
       latitude: 56.254085527778
       longitude: -3.2066960277778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d87ba0e:
     aperture: f/2.0
@@ -84,10 +64,6 @@ photos:
       latitude: 56.254085527778
       longitude: -3.2069077222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   4bb5be2:
     aperture: f/2.0
@@ -98,8 +74,4 @@ photos:
       latitude: 56.254280083333
       longitude: -3.2067577777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-geneva-history-museum.yml b/_data/gallery/2014-geneva-history-museum.yml
index 124d3f0..d2f90e9 100644
--- a/_data/gallery/2014-geneva-history-museum.yml
+++ b/_data/gallery/2014-geneva-history-museum.yml
@@ -1,4 +1,4 @@
-title: geneva-2014-history-museum
+title: Geneva - History Museum
 date: 2014-12-21
 map:
   latitude: 46.201427685764
@@ -28,12 +28,7 @@ photos:
     file: IMG_20141221_101052
     location:
       latitude: 46.201526638889
-      longitude: 6.1557078333333
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  dd27cb6:
+      longitude: 6.1557078333333  dd27cb6:
     date: 2014-12-21 10:11:06
     file: IMG_20141221_101105
     location:
diff --git a/_data/gallery/2014-geneva-maison-tavel.yml b/_data/gallery/2014-geneva-maison-tavel.yml
index 5b9a724..189c576 100644
--- a/_data/gallery/2014-geneva-maison-tavel.yml
+++ b/_data/gallery/2014-geneva-maison-tavel.yml
@@ -1,4 +1,4 @@
-title: geneva-2014-maison-tavel
+title: Geneva - Maison Tavel
 date: 2014-12-21
 map:
   latitude: 46.201288061966
@@ -71,12 +71,7 @@ photos:
     file: IMG_20141221_115509
     location:
       latitude: 46.201541888889
-      longitude: 6.1470851666667
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  30417b6:
+      longitude: 6.1470851666667  30417b6:
     date: 2014-12-21 11:56:46
     file: IMG_20141221_115645
     location:
diff --git a/_data/gallery/2014-geneva.yml b/_data/gallery/2014-geneva.yml
index 5b7bec6..ab39550 100644
--- a/_data/gallery/2014-geneva.yml
+++ b/_data/gallery/2014-geneva.yml
@@ -1,4 +1,4 @@
-title: geneva-2014
+title: Geneva
 date: 2014-12-20
 map:
   latitude: 46.211739271368
@@ -26,12 +26,12 @@ photos:
     location:
       latitude: 46.213810833333
       longitude: 6.1524488888889
-    model: A0001
+    model: One
     sizes:
       640w: { height: 330, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: oneplus
+    make: OnePlus
   eb22ad6:
     date: 2014-12-20 17:40:28
     file: IMG_20141220_174027
@@ -67,23 +67,18 @@ photos:
     file: IMG_20141220_192151
     location:
       latitude: 46.207836138889
-      longitude: 6.1437406388889
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  02e7b3d:
+      longitude: 6.1437406388889  02e7b3d:
     date: 2014-12-21 11:24:46
     file: PANO_20141221_112409
     location:
       latitude: 46.204582777778
       longitude: 6.1532108333333
-    model: A0001
+    model: One
     sizes:
       640w: { height: 135, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: oneplus
+    make: OnePlus
   51441d6:
     date: 2014-12-21 11:26:51
     file: IMG_20141221_112650
diff --git a/_data/gallery/2014-glasgow.yml b/_data/gallery/2014-glasgow.yml
index 8298308..7895198 100644
--- a/_data/gallery/2014-glasgow.yml
+++ b/_data/gallery/2014-glasgow.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 55.862373333333
       longitude: -4.2331766944444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   edf0f54:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 55.862434361111
       longitude: -4.2329826111111
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   819ca68:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 55.856777166667
       longitude: -4.2433500277778
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   c85629d:
     aperture: f/2.0
@@ -56,10 +44,6 @@ photos:
       latitude: 55.855140666667
       longitude: -4.2434072222222
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   8ab87e1:
     aperture: f/2.0
@@ -70,10 +54,6 @@ photos:
       latitude: 55.855140666667
       longitude: -4.2433929444444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   f017173:
     aperture: f/2.0
@@ -84,10 +64,6 @@ photos:
       latitude: 55.860454555556
       longitude: -4.2521462222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d3335c6:
     aperture: f/2.0
@@ -98,10 +74,6 @@ photos:
       latitude: 55.861888861111
       longitude: -4.2492761388889
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   a82d539:
     aperture: f/2.0
@@ -112,10 +84,6 @@ photos:
       latitude: 55.85713575
       longitude: -4.2536396944444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   389310b:
     aperture: f/2.0
@@ -126,10 +94,6 @@ photos:
       latitude: 55.857994055556
       longitude: -4.2534589722222
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   c8c2b4e:
     aperture: f/2.0
@@ -140,8 +104,4 @@ photos:
       latitude: 55.859889972222
       longitude: -4.2497958888889
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-glenshee-ski.yml b/_data/gallery/2014-glenshee-ski.yml
index 3aceba3..78cd1ad 100644
--- a/_data/gallery/2014-glenshee-ski.yml
+++ b/_data/gallery/2014-glenshee-ski.yml
@@ -10,24 +10,16 @@ photos:
     aperture: f/11.0
     date: 2014-03-09 10:37:16
     exposure: 1/80
-    file: DSC00326.JPG
+    file: DSC00326
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   2493030:
     aperture: f/4.5
     date: 2014-03-09 10:37:35
     exposure: 1/500
-    file: DSC00328.JPG
+    file: DSC00328
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   691102c:
     aperture: f/2.0
     date: 2014-03-09 11:03:03
@@ -37,10 +29,6 @@ photos:
       latitude: 56.885940527778
       longitude: -3.3776604722222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   ec79d73:
     aperture: f/2.0
@@ -48,10 +36,6 @@ photos:
     exposure: 456/1000000
     file: IMG_20140309_110525
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   1b0f8a7:
     aperture: f/2.0
@@ -59,10 +43,6 @@ photos:
     exposure: 437/1000000
     file: IMG_20140309_110636
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   8a7f91c:
     aperture: f/2.0
@@ -70,10 +50,6 @@ photos:
     exposure: 837/1000000
     file: IMG_20140309_115627
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d75944a:
     aperture: f/2.0
@@ -81,10 +57,6 @@ photos:
     exposure: 513/1000000
     file: IMG_20140309_115648
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   e0bfe6d:
     aperture: f/2.0
@@ -92,10 +64,6 @@ photos:
     exposure: 323/1000000
     file: IMG_20140309_133452
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   bf58531:
     aperture: f/2.0
@@ -103,15 +71,7 @@ photos:
     exposure: 342/1000000
     file: IMG_20140309_134558
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   35969f0:
     date: 2014-03-12 20:19:54
-    file: PANO_20140309_133459
-    sizes:
-      640w: { height: 199, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+    file: PANO_20140309_133459
\ No newline at end of file
diff --git a/_data/gallery/2014-heathergems-factory.yml b/_data/gallery/2014-heathergems-factory.yml
index a5ecf94..73e31ec 100644
--- a/_data/gallery/2014-heathergems-factory.yml
+++ b/_data/gallery/2014-heathergems-factory.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.707992527778
       longitude: -3.7423253333333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   ecaf22c:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.707992527778
       longitude: -3.7423253333333
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   4490829:
     aperture: f/2.0
@@ -42,8 +34,4 @@ photos:
       latitude: 56.707992527778
       longitude: -3.7423253333333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-hike-blair-atholl.yml b/_data/gallery/2014-hike-blair-atholl.yml
index a0d24b2..d3fc977 100644
--- a/_data/gallery/2014-hike-blair-atholl.yml
+++ b/_data/gallery/2014-hike-blair-atholl.yml
@@ -12,10 +12,6 @@ photos:
     exposure: 8333/1000000
     file: IMG_20140622_104707
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   390d16f:
     aperture: f/2.0
@@ -23,10 +19,6 @@ photos:
     exposure: 8333/1000000
     file: IMG_20140622_104724
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   7b2bbdd:
     aperture: f/2.0
@@ -34,10 +26,6 @@ photos:
     exposure: 799/1000000
     file: IMG_20140622_110448
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   ec7fce0:
     aperture: f/2.0
@@ -45,10 +33,6 @@ photos:
     exposure: 970/1000000
     file: IMG_20140622_111325
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   8830f36:
     aperture: f/2.0
@@ -56,10 +40,6 @@ photos:
     exposure: 970/1000000
     file: IMG_20140622_113805
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   5b194ea:
     aperture: f/2.0
@@ -67,10 +47,6 @@ photos:
     exposure: 5346/1000000
     file: IMG_20140622_115029
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   a581781:
     aperture: f/2.0
@@ -78,10 +54,6 @@ photos:
     exposure: 4604/1000000
     file: IMG_20140622_115321
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   3f26b8f:
     aperture: f/2.0
@@ -89,10 +61,6 @@ photos:
     exposure: 4604/1000000
     file: IMG_20140622_115326
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   828cd90:
     aperture: f/2.0
@@ -100,10 +68,6 @@ photos:
     exposure: 2777/1000000
     file: IMG_20140622_115502
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   903da93:
     aperture: f/2.0
@@ -111,10 +75,6 @@ photos:
     exposure: 742/1000000
     file: IMG_20140622_123152
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   fe10806:
     aperture: f/2.0
@@ -122,10 +82,6 @@ photos:
     exposure: 570/1000000
     file: IMG_20140622_125930
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6d1d94b:
     aperture: f/2.0
@@ -133,10 +89,6 @@ photos:
     exposure: 665/1000000
     file: IMG_20140622_132324
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   76d845b:
     aperture: f/2.0
@@ -144,10 +96,6 @@ photos:
     exposure: 1236/1000000
     file: IMG_20140622_134950
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2774d8c:
     aperture: f/2.0
@@ -155,10 +103,6 @@ photos:
     exposure: 589/1000000
     file: IMG_20140622_135018
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6e6aec8:
     aperture: f/2.0
@@ -166,10 +110,6 @@ photos:
     exposure: 970/1000000
     file: IMG_20140622_135503
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   82ade2e:
     aperture: f/2.0
@@ -177,10 +117,6 @@ photos:
     exposure: 494/1000000
     file: IMG_20140622_140144
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   5142e2a:
     aperture: f/2.0
@@ -188,10 +124,6 @@ photos:
     exposure: 494/1000000
     file: IMG_20140622_140147
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   8be2331:
     aperture: f/2.0
@@ -202,10 +134,6 @@ photos:
       latitude: 56.780765527778
       longitude: -3.9925177222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   536206f:
     aperture: f/2.0
@@ -216,10 +144,6 @@ photos:
       latitude: 56.722061138889
       longitude: -3.7633285277778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   c39be91:
     aperture: f/2.0
@@ -230,10 +154,6 @@ photos:
       latitude: 56.85495375
       longitude: -3.7712606944444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   e20d261:
     date: 2014-06-23 21:02:14
diff --git a/_data/gallery/2014-holidays-uitgeest.yml b/_data/gallery/2014-holidays-uitgeest.yml
index bb16897..ff106f6 100644
--- a/_data/gallery/2014-holidays-uitgeest.yml
+++ b/_data/gallery/2014-holidays-uitgeest.yml
@@ -6,98 +6,62 @@ photos:
     aperture: f/6.0
     date: 2014-08-15 09:58:51
     exposure: 1/250
-    file: SAM_6562.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6562
+    model: WB600
+    make: Samsung
   81514aa:
     aperture: f/5.2
     date: 2014-08-15 11:32:57
     exposure: 1/350
-    file: SAM_6566.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6566
+    model: WB600
+    make: Samsung
   f3a299c:
     aperture: f/6.2
     date: 2014-08-15 17:07:33
     exposure: 1/500
-    file: SAM_6571.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6571
+    model: WB600
+    make: Samsung
   65992f3:
     aperture: f/4.8
     date: 2014-08-15 18:48:51
     exposure: 1/750
-    file: SAM_6578.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6578
+    model: WB600
+    make: Samsung
   93d1337:
     aperture: f/6.2
     date: 2014-08-23 18:46:43
     exposure: 1/350
-    file: SAM_6598.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6598
+    model: WB600
+    make: Samsung
   f672d0b:
     aperture: f/4.6
     date: 2014-08-24 15:18:38
     exposure: 1/180
-    file: SAM_6609.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6609
+    model: WB600
+    make: Samsung
   510e9f2:
     aperture: f/5.6
     date: 2014-08-24 15:53:26
     exposure: 1/350
-    file: SAM_6613.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6613
+    model: WB600
+    make: Samsung
   7a3902a:
     aperture: f/5.2
     date: 2014-08-24 16:48:34
     exposure: 1/500
-    file: SAM_6621.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_6621
+    model: WB600
+    make: Samsung
   868e3ca:
     aperture: f/3.4
     date: 2014-08-24 20:15:50
     exposure: 1/30
-    file: SAM_6640.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_6640
+    model: WB600
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2014-kettins.yml b/_data/gallery/2014-kettins.yml
index c28514a..1015f66 100644
--- a/_data/gallery/2014-kettins.yml
+++ b/_data/gallery/2014-kettins.yml
@@ -14,8 +14,4 @@ photos:
       latitude: 56.5370445
       longitude: -3.2448537222222
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-lab.yml b/_data/gallery/2014-lab.yml
index 13c8439..6a5174f 100644
--- a/_data/gallery/2014-lab.yml
+++ b/_data/gallery/2014-lab.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 56.339908583333
       longitude: -2.8108699166667
-    model: HTC One S
+    model: One S
     make: HTC
   7fbdef7:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.339881888889
       longitude: -2.8108689444444
-    model: HTC One S
+    model: One S
     make: HTC
   7cd1677:
     aperture: f/2.0
@@ -34,14 +34,14 @@ photos:
     location:
       latitude: 56.339775083333
       longitude: -2.8111116944444
-    model: HTC One S
+    model: One S
     make: HTC
   4b02587:
     aperture: f/2.0
     date: 2013-11-19 17:06:04
     exposure: 19997/1000000
     file: IMAG0101
-    model: HTC One S
+    model: One S
     make: HTC
   b355194:
     aperture: f/2.0
@@ -51,7 +51,7 @@ photos:
     location:
       latitude: 56.339794138889
       longitude: -2.8111169166667
-    model: HTC One S
+    model: One S
     make: HTC
   e4c20c9:
     aperture: f/2.0
@@ -61,7 +61,7 @@ photos:
     location:
       latitude: 56.340091694444
       longitude: -2.8111204722222
-    model: HTC One S
+    model: One S
     make: HTC
   2fe7eb5:
     aperture: f/2.0
@@ -71,7 +71,7 @@ photos:
     location:
       latitude: 56.339836111111
       longitude: -2.8107404444444
-    model: HTC One S
+    model: One S
     make: HTC
   542b2d6:
     aperture: f/2.0
@@ -81,7 +81,7 @@ photos:
     location:
       latitude: 56.339836111111
       longitude: -2.8107404444444
-    model: HTC One S
+    model: One S
     make: HTC
   17eed82:
     aperture: f/2.0
@@ -91,11 +91,9 @@ photos:
     location:
       latitude: 56.339775083333
       longitude: -2.8108983333333
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   69e2076:
     aperture: f/2.0
     date: 2013-11-29 14:13:33
@@ -104,11 +102,9 @@ photos:
     location:
       latitude: 56.340068805556
       longitude: -2.8114206944444
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   aac5ee7:
     aperture: f/2.0
     date: 2014-01-26 10:25:23
@@ -118,9 +114,5 @@ photos:
       latitude: 56.339691138889
       longitude: -2.8108002777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
     description: blabla
\ No newline at end of file
diff --git a/_data/gallery/2014-lade-braes.yml b/_data/gallery/2014-lade-braes.yml
index 85f24f1..c653c1a 100644
--- a/_data/gallery/2014-lade-braes.yml
+++ b/_data/gallery/2014-lade-braes.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 56.3355255
       longitude: -2.8091225833333
-    model: HTC One S
+    model: One S
     make: HTC
   ef5d19f:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.333198527778
       longitude: -2.8286838333333
-    model: HTC One S
+    model: One S
     make: HTC
   fd003dd:
     aperture: f/2.0
@@ -34,11 +34,9 @@ photos:
     location:
       latitude: 56.333198527778
       longitude: -2.8286838333333
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   58fa9a3:
     aperture: f/2.0
     date: 2013-11-05 08:39:30
@@ -47,7 +45,7 @@ photos:
     location:
       latitude: 56.332935333333
       longitude: -2.8292493611111
-    model: HTC One S
+    model: One S
     make: HTC
   79c4bb3:
     aperture: f/2.0
@@ -57,11 +55,9 @@ photos:
     location:
       latitude: 56.332847583333
       longitude: -2.8294379444444
-    model: HTC One S
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
+    width: 200
   16e3c80:
     aperture: f/2.0
     date: 2013-11-20 08:37:31
@@ -70,7 +66,7 @@ photos:
     location:
       latitude: 56.333194722222
       longitude: -2.8285584722222
-    model: HTC One S
+    model: One S
     make: HTC
   c9e118b:
     aperture: f/2.0
@@ -80,7 +76,7 @@ photos:
     location:
       latitude: 56.333709694444
       longitude: -2.8137059444444
-    model: HTC One S
+    model: One S
     make: HTC
   8352ca0:
     aperture: f/2.0
@@ -90,7 +86,7 @@ photos:
     location:
       latitude: 56.333183277778
       longitude: -2.8123201944444
-    model: HTC One S
+    model: One S
     make: HTC
   49d78d7:
     aperture: f/2.0
@@ -101,8 +97,4 @@ photos:
       latitude: 56.33400725
       longitude: -2.8139212222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-london.yml b/_data/gallery/2014-london.yml
index 99ed950..d000ae8 100644
--- a/_data/gallery/2014-london.yml
+++ b/_data/gallery/2014-london.yml
@@ -6,416 +6,252 @@ photos:
     aperture: f/3.3
     date: 2014-04-11 12:09:18
     exposure: 1/350
-    file: SAM_1235.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1235
+    model: PL211
+    make: Samsung
   e931280:
     aperture: f/3.3
     date: 2014-04-11 12:12:51
     exposure: 1/1000
-    file: SAM_1239.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1239
+    model: PL211
+    make: Samsung
   b61c768:
     aperture: f/5.1
     date: 2014-04-11 12:35:58
     exposure: 1/250
-    file: SAM_1241.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1241
+    model: PL211
+    make: Samsung
   80ece0b:
     aperture: f/3.5
     date: 2014-04-11 12:37:33
     exposure: 1/500
-    file: SAM_1247.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1247
+    model: PL211
+    make: Samsung
   cfae326:
     aperture: f/4.0
     date: 2014-04-11 13:32:42
     exposure: 1/250
-    file: SAM_1252.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1252
+    model: PL211
+    make: Samsung
   bd7dd57:
     aperture: f/3.3
     date: 2014-04-11 14:10:10
     exposure: 1/2
-    file: SAM_1256.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1256
+    model: PL211
+    make: Samsung
   9edb588:
     aperture: f/3.3
     date: 2014-04-11 14:10:40
     exposure: 1/10
-    file: SAM_1258.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1258
+    model: PL211
+    make: Samsung
   b55060e:
     aperture: f/3.7
     date: 2014-04-11 15:08:06
     exposure: 1/500
-    file: SAM_1264.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1264
+    model: PL211
+    make: Samsung
   9db6668:
     aperture: f/3.3
     date: 2014-04-11 15:10:03
     exposure: 1/350
-    file: SAM_1268.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1268
+    model: PL211
+    make: Samsung
   21a1973:
     aperture: f/3.5
     date: 2014-04-11 16:10:55
     exposure: 1/750
-    file: SAM_1271.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1271
+    model: PL211
+    make: Samsung
   167b766:
     aperture: f/3.5
     date: 2014-04-11 16:12:14
     exposure: 1/750
-    file: SAM_1274.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1274
+    model: PL211
+    make: Samsung
   46d4f09:
     aperture: f/3.3
     date: 2014-04-11 17:21:18
     exposure: 1/45
-    file: SAM_1281.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1281
+    model: PL211
+    make: Samsung
   8fd08cd:
     aperture: f/5.3
     date: 2014-04-11 17:41:29
     exposure: 1/250
-    file: SAM_1285.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1285
+    model: PL211
+    make: Samsung
   2f0a9e7:
     aperture: f/3.3
     date: 2014-04-12 10:39:52
     exposure: 1/45
-    file: SAM_1291.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1291
+    model: PL211
+    make: Samsung
   37168a7:
     aperture: f/3.3
     date: 2014-04-12 10:40:24
     exposure: 1/45
-    file: SAM_1292.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1292
+    model: PL211
+    make: Samsung
   175e4a4:
     aperture: f/3.3
     date: 2014-04-12 11:05:11
     exposure: 1/500
-    file: SAM_1301.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1301
+    model: PL211
+    make: Samsung
   e9a8ce2:
     aperture: f/4.0
     date: 2014-04-12 11:05:43
     exposure: 1/350
-    file: SAM_1303.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1303
+    model: PL211
+    make: Samsung
   4685d41:
     aperture: f/3.3
     date: 2014-04-12 11:06:29
     exposure: 1/750
-    file: SAM_1305.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1305
+    model: PL211
+    make: Samsung
   0107fba:
     aperture: f/4.3
     date: 2014-04-12 13:08:57
     exposure: 1/250
-    file: SAM_1319.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1319
+    model: PL211
+    make: Samsung
   80511ef:
     aperture: f/4.3
     date: 2014-04-12 13:09:33
     exposure: 1/500
-    file: SAM_1320.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1320
+    model: PL211
+    make: Samsung
   c2f7617:
     aperture: f/3.3
     date: 2014-04-12 13:16:04
     exposure: 1/45
-    file: SAM_1321.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1321
+    model: PL211
+    make: Samsung
   aeb8e97:
     aperture: f/3.3
     date: 2014-04-12 13:42:29
     exposure: 1/500
-    file: SAM_1323.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1323
+    model: PL211
+    make: Samsung
   79aceca:
     aperture: f/3.3
     date: 2014-04-12 13:52:53
     exposure: 1/500
-    file: SAM_1324.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1324
+    model: PL211
+    make: Samsung
   fb4ad0f:
     aperture: f/3.3
     date: 2014-04-12 14:49:41
     exposure: 1/500
-    file: SAM_1330.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1330
+    model: PL211
+    make: Samsung
   08f041c:
     aperture: f/3.3
     date: 2014-04-12 15:24:16
     exposure: 1/350
-    file: SAM_1334.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1334
+    model: PL211
+    make: Samsung
   adf49d1:
     aperture: f/3.3
     date: 2014-04-12 16:16:42
     exposure: 1/90
-    file: SAM_1338.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1338
+    model: PL211
+    make: Samsung
   4eb0504:
     aperture: f/9.2
     date: 2014-04-13 10:28:55
     exposure: 1/125
-    file: SAM_1358.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1358
+    model: PL211
+    make: Samsung
   8484827:
     aperture: f/3.3
     date: 2014-04-13 11:09:03
     exposure: 1/750
-    file: SAM_1363.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1363
+    model: PL211
+    make: Samsung
   cf3e680:
     aperture: f/3.3
     date: 2014-04-13 14:16:59
     exposure: 1/750
-    file: SAM_1372.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1372
+    model: PL211
+    make: Samsung
   dbeaf61:
     aperture: f/3.3
     date: 2014-04-13 16:29:43
     exposure: 1/45
-    file: SAM_1380.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1380
+    model: PL211
+    make: Samsung
   5f09187:
     aperture: f/3.3
     date: 2014-04-13 16:29:56
     exposure: 1/125
-    file: SAM_1381.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_1381
+    model: PL211
+    make: Samsung
   1d6e904:
     date: 2014-04-16 21:42:40
-    file: SAM_1288.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1288
   ac4835b:
     date: 2014-04-16 21:43:12
-    file: SAM_1250.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1250
   6acb4fd:
     date: 2014-04-16 21:43:28
-    file: SAM_1259.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1259
   16490c3:
     date: 2014-04-16 21:46:01
-    file: SAM_1263.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1263
   8cf06a9:
     date: 2014-04-16 21:46:15
-    file: SAM_1275.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1275
   e623f9e:
     date: 2014-04-16 21:46:31
-    file: SAM_1287.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1287
   17c5d24:
     date: 2014-04-16 21:50:19
-    file: SAM_1306.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1306
   2d89cc4:
     date: 2014-04-16 21:50:41
-    file: SAM_1315.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1315
   16129a9:
     date: 2014-04-16 21:50:58
-    file: SAM_1317.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1317
   80312bc:
     date: 2014-04-16 21:51:29
-    file: SAM_1364.JPG
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    file: SAM_1364
   edd4079:
     date: 2014-04-16 21:51:38
-    file: SAM_1371.JPG
+    file: SAM_1371
     sizes:
       640w: { height: 854, width: 640 }
       200x200: { height: 200, width: 200 }
diff --git a/_data/gallery/2014-movember.yml b/_data/gallery/2014-movember.yml
index 4b0f39b..42b5f79 100644
--- a/_data/gallery/2014-movember.yml
+++ b/_data/gallery/2014-movember.yml
@@ -10,41 +10,22 @@ photos:
     file: IMG_20141129_104857
     location:
       latitude: 56.330326055556
-      longitude: -2.8101809166667
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  c02ded3:
+      longitude: -2.8101809166667  c02ded3:
     date: 2014-11-29 10:49:37
     file: IMG_20141129_104936
     location:
       latitude: 56.330318444444
-      longitude: -2.81016825
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  a4ee560:
+      longitude: -2.81016825  a4ee560:
     date: 2014-11-29 10:49:55
     file: IMG_20141129_104954
     location:
       latitude: 56.330326055556
-      longitude: -2.8101895
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  9cab68f:
+      longitude: -2.8101895  9cab68f:
     date: 2014-11-29 10:57:58
     file: IMG_20141129_105757
     location:
       latitude: 56.330329888889
       longitude: -2.8101723333333
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
   786a35e:
     date: 2014-11-29 11:00:21
     file: IMG_20141129_110020
diff --git a/_data/gallery/2014-room.yml b/_data/gallery/2014-room.yml
index 9035866..e6f00c5 100644
--- a/_data/gallery/2014-room.yml
+++ b/_data/gallery/2014-room.yml
@@ -10,12 +10,7 @@ photos:
     date: 2010-06-01 19:44:20
     exposure: 1/60
     file: Garden
-    model: Canon DIGITAL IXUS 60
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: Canon
+    model: Digital IXUS 60    make: Canon
   aab3b8a:
     aperture: f/2.8
     date: 2013-06-19 09:16:12
@@ -79,7 +74,7 @@ photos:
     location:
       latitude: 56.330444333333
       longitude: -2.8103780555556
-    model: HTC One S
+    model: One S
     make: HTC
   a852e5d:
     aperture: f/2.0
@@ -89,7 +84,7 @@ photos:
     location:
       latitude: 56.330451944444
       longitude: -2.8104240833333
-    model: HTC One S
+    model: One S
     make: HTC
   b69ebfc:
     aperture: f/2.0
@@ -99,7 +94,7 @@ photos:
     location:
       latitude: 56.330413805556
       longitude: -2.8102748055556
-    model: HTC One S
+    model: One S
     make: HTC
   187e4cf:
     aperture: f/2.0
@@ -109,7 +104,7 @@ photos:
     location:
       latitude: 56.330398555556
       longitude: -2.810256
-    model: HTC One S
+    model: One S
     make: HTC
   fd2f9d0:
     aperture: f/2.0
@@ -119,7 +114,7 @@ photos:
     location:
       latitude: 56.330413805556
       longitude: -2.8102721944444
-    model: HTC One S
+    model: One S
     make: HTC
   bf7758f:
     aperture: f/2.0
@@ -130,8 +125,4 @@ photos:
       latitude: 56.330379472222
       longitude: -2.8101570555556
     model: One S
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-seat-ibiza.yml b/_data/gallery/2014-seat-ibiza.yml
index 308a1d3..09f8b08 100644
--- a/_data/gallery/2014-seat-ibiza.yml
+++ b/_data/gallery/2014-seat-ibiza.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.2770195
       longitude: -2.7349135555556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   fce208a:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.276992777778
       longitude: -2.7349295277778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   aa7c6f4:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 56.276992777778
       longitude: -2.7349286388889
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   416f4df:
     aperture: f/2.0
@@ -56,10 +44,6 @@ photos:
       latitude: 56.276988972222
       longitude: -2.73492075
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   99fd724:
     aperture: f/2.0
@@ -70,10 +54,6 @@ photos:
       latitude: 56.27706525
       longitude: -2.7348012777778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d042c15:
     aperture: f/2.0
@@ -84,10 +64,6 @@ photos:
       latitude: 56.27703475
       longitude: -2.7348155833333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   37a7e57:
     aperture: f/2.0
@@ -98,10 +74,6 @@ photos:
       latitude: 56.2770195
       longitude: -2.7348515555556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   634e9b5:
     aperture: f/2.0
@@ -112,10 +84,6 @@ photos:
       latitude: 56.2770195
       longitude: -2.7348520833333
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   bafebf3:
     aperture: f/2.0
@@ -126,10 +94,6 @@ photos:
       latitude: 56.2770195
       longitude: -2.7348530277778
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d258ed1:
     aperture: f/2.0
@@ -140,10 +104,6 @@ photos:
       latitude: 56.2770195
       longitude: -2.7348546944444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6f63693:
     aperture: f/2.0
@@ -154,8 +114,4 @@ photos:
       latitude: 56.2770195
       longitude: -2.7348546944444
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-st-andrews.yml b/_data/gallery/2014-st-andrews.yml
index 83ae312..252687d 100644
--- a/_data/gallery/2014-st-andrews.yml
+++ b/_data/gallery/2014-st-andrews.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 56.337848638889
       longitude: -2.8026039722222
-    model: HTC One S
+    model: One S
     make: HTC
   f3ed1b7:
     aperture: f/2.0
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.328914638889
       longitude: -2.8081791388889
-    model: HTC One S
+    model: One S
     make: HTC
   f6da79d:
     aperture: f/2.0
@@ -34,7 +34,7 @@ photos:
     location:
       latitude: 56.343193027778
       longitude: -2.8090896388889
-    model: HTC One S
+    model: One S
     make: HTC
   71a8e74:
     aperture: f/2.0
@@ -44,7 +44,7 @@ photos:
     location:
       latitude: 56.346015916667
       longitude: -2.8243839722222
-    model: HTC One S
+    model: One S
     make: HTC
   5061a38:
     aperture: f/2.0
@@ -55,10 +55,6 @@ photos:
       latitude: 56.335987083333
       longitude: -2.818146
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   0466e83:
     aperture: f/2.0
@@ -69,154 +65,98 @@ photos:
       latitude: 56.3164215
       longitude: -2.8193521388889
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   21e6cc3:
     aperture: f/16.0
     date: 2014-02-16 13:52:54
     exposure: 1/250
-    file: DSC00261.JPG
+    file: DSC00261
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   7c9e867:
     aperture: f/16.0
     date: 2014-02-16 14:45:31
     exposure: 1/100
-    file: DSC00273.JPG
+    file: DSC00273
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   3cfcc4b:
     aperture: f/16.0
     date: 2014-02-16 14:48:43
     exposure: 1/125
-    file: DSC00274.JPG
+    file: DSC00274
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   cc68fbf:
     aperture: f/11.0
     date: 2014-03-01 10:39:07
     exposure: 1/125
-    file: DSC00279.JPG
+    file: DSC00279
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   d3a67dd:
     aperture: f/16.0
     date: 2014-03-01 10:39:31
     exposure: 1/250
-    file: DSC00280.JPG
+    file: DSC00280
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   6383ea8:
     aperture: f/16.0
     date: 2014-03-01 10:39:47
     exposure: 1/80
-    file: DSC00281.JPG
+    file: DSC00281
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   4d8f437:
     aperture: f/11.0
     date: 2014-03-01 10:41:37
     exposure: 1/250
-    file: DSC00282.JPG
+    file: DSC00282
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   86d40a8:
     aperture: f/16.0
     date: 2014-03-01 10:45:18
     exposure: 1/160
-    file: DSC00283.JPG
+    file: DSC00283
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   0d857ec:
     aperture: f/16.0
     date: 2014-03-01 10:54:28
     exposure: 1/250
-    file: DSC00286.JPG
+    file: DSC00286
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   c4a1884:
     aperture: f/14.0
     date: 2014-03-01 11:01:46
     exposure: 1/200
-    file: DSC00288.JPG
+    file: DSC00288
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   5568ee5:
     aperture: f/16.0
     date: 2014-03-01 11:01:56
     exposure: 1/100
-    file: DSC00289.JPG
+    file: DSC00289
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   2d0ebb4:
     aperture: f/16.0
     date: 2014-03-01 11:04:13
     exposure: 1/250
-    file: DSC00291.JPG
+    file: DSC00291
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   084b457:
     aperture: f/16.0
     date: 2014-03-01 13:04:51
     exposure: 1/125
-    file: DSC00303.JPG
+    file: DSC00303
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   c130d74:
     aperture: f/2.0
     date: 2014-05-13 18:29:13
@@ -226,10 +166,6 @@ photos:
       latitude: 56.331214888889
       longitude: -2.8060073611111
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   52395d5:
     aperture: f/2.0
@@ -240,10 +176,6 @@ photos:
       latitude: 56.3316345
       longitude: -2.8117885555556
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   beeeb81:
     date: 2014-05-19 08:34:41
diff --git a/_data/gallery/2014-strathkinness.yml b/_data/gallery/2014-strathkinness.yml
index 43f28e5..b0785bf 100644
--- a/_data/gallery/2014-strathkinness.yml
+++ b/_data/gallery/2014-strathkinness.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.337116222222
       longitude: -2.8763108333333
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   05d8a05:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.337413777778
       longitude: -2.8765287222222
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   7ef2536:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 56.336990333333
       longitude: -2.8756749444444
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   a0b658f:
     aperture: f/2.0
@@ -56,10 +44,6 @@ photos:
       latitude: 56.337757083333
       longitude: -2.8767197222222
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   3dd9d17:
     aperture: f/2.0
@@ -70,10 +54,6 @@ photos:
       latitude: 56.336620305556
       longitude: -2.8766889444444
     model: One S
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   fae19bc:
     aperture: f/2.0
@@ -84,10 +64,6 @@ photos:
       latitude: 56.337425222222
       longitude: -2.8768122222222
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   5280fae:
     aperture: f/2.0
@@ -98,10 +74,6 @@ photos:
       latitude: 56.33714675
       longitude: -2.8768641666667
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   04e8366:
     aperture: f/2.0
@@ -112,10 +84,6 @@ photos:
       latitude: 56.336795805556
       longitude: -2.8794352777778
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   73efeac:
     aperture: f/2.0
@@ -126,10 +94,6 @@ photos:
       latitude: 56.331615444444
       longitude: -2.8765175277778
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   0afb61d:
     aperture: f/2.0
@@ -137,10 +101,6 @@ photos:
     exposure: 2397/1000000
     file: IMG_20140125_150525
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   f72837a:
     aperture: f/2.0
@@ -151,10 +111,6 @@ photos:
       latitude: 56.331615444444
       longitude: -2.8765175277778
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   5783ac0:
     aperture: f/2.0
@@ -165,10 +121,6 @@ photos:
       latitude: 56.331615444444
       longitude: -2.8765175277778
     model: One S
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   64cb179:
     date: 2014-01-26 10:59:00
diff --git a/_data/gallery/2014-tentmuir.yml b/_data/gallery/2014-tentmuir.yml
index 926cd38..2f371c9 100644
--- a/_data/gallery/2014-tentmuir.yml
+++ b/_data/gallery/2014-tentmuir.yml
@@ -1,4 +1,4 @@
-title: tentmuir
+title: Tentmuir
 date: 2014-11-01
 map:
   latitude: 56.412449488095
@@ -9,54 +9,54 @@ photos:
     aperture: f/2.0
     date: 2014-11-01 14:47:38
     exposure: 1/33
-    file: DSC_0047.JPG
+    file: DSC_0047
     location:
       latitude: 56.406906111111
       longitude: -2.8176874722222
-    model: A0001
-    make: ONEPLUS
+    model: One
+    make: OnePlus
   f646f54:
     aperture: f/2.0
     date: 2014-11-01 14:49:38
     exposure: 1/100
-    file: DSC_0050.JPG
+    file: DSC_0050
     location:
       latitude: 56.407070138889
       longitude: -2.8171441388889
-    model: A0001
+    model: One
     sizes:
       640w: { height: 864, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: ONEPLUS
+    make: OnePlus
   bb2244f:
     date: 2014-11-01 14:57:21
     exposure: 1/4836
     file: 20141101_145721_HDR
-    model: A0001
-    make: ONEPLUS
+    model: One
+    make: OnePlus
   ef1167e:
     aperture: f/2.0
     date: 2014-11-01 14:59:42
     exposure: 1/3023
-    file: DSC_0056.JPG
+    file: DSC_0056
     location:
       latitude: 56.406894666667
       longitude: -2.8068923888889
-    model: A0001
-    make: ONEPLUS
+    model: One
+    make: OnePlus
   3ffd76b:
     date: 2014-11-01 15:02:01
     file: PANO_20141101_150113
     location:
       latitude: 56.406965833333
       longitude: -2.8081458333333
-    model: A0001
+    model: One
     sizes:
       640w: { height: 120, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: ONEPLUS
+    make: OnePlus
   0d4a290:
     aperture: f/2.0
     date: 2014-11-01 15:09:08
@@ -65,29 +65,29 @@ photos:
     location:
       latitude: 56.406723
       longitude: -2.8170838611111
-    model: A0001
-    make: ONEPLUS
+    model: One
+    make: OnePlus
   797d6e1:
     date: 2014-11-01 15:16:58
     file: PANO_20141101_151601
     location:
       latitude: 56.405583888889
       longitude: -2.8241738888889
-    model: A0001
+    model: One
     sizes:
       640w: { height: 269, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: ONEPLUS
+    make: OnePlus
   03da288:
     date: 2014-11-01 15:41:54
     file: PANO_20141101_154120
     location:
       latitude: 56.447002777778
       longitude: -2.8735788888889
-    model: A0001
+    model: One
     sizes:
       640w: { height: 163, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: ONEPLUS
\ No newline at end of file
+    make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2014-the-house-of-bruar.yml b/_data/gallery/2014-the-house-of-bruar.yml
index b45280d..13e82ea 100644
--- a/_data/gallery/2014-the-house-of-bruar.yml
+++ b/_data/gallery/2014-the-house-of-bruar.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.733497611111
       longitude: -3.8135258888889
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   bfe328a:
     aperture: f/2.0
@@ -25,10 +21,6 @@ photos:
     exposure: 39993/1000000
     file: img_20140208_135625
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   8aaba27:
     aperture: f/2.0
@@ -36,10 +28,6 @@ photos:
     exposure: 50001/1000000
     file: img_20140208_135636
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   a707acb:
     aperture: f/2.0
@@ -50,19 +38,11 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   5d9fe3b:
     aperture: f/4.0
     date: 2014-02-08 15:08:26
     exposure: 1/160
-    file: DSC00216.JPG
+    file: DSC00216
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
\ No newline at end of file
+    make: Sony
\ No newline at end of file
diff --git a/_data/gallery/2014-views.yml b/_data/gallery/2014-views.yml
index 8a30d0f..5df32ad 100644
--- a/_data/gallery/2014-views.yml
+++ b/_data/gallery/2014-views.yml
@@ -14,14 +14,14 @@ photos:
     location:
       latitude: 56.345817555556
       longitude: -2.8226756944444
-    model: HTC One S
+    model: One S
     make: HTC
   2df93aa:
     aperture: f/2.0
     date: 2013-11-06 10:35:00
     exposure: 913/1000000
     file: IMAG0079
-    model: HTC One S
+    model: One S
     make: HTC
   318c64f:
     aperture: f/2.0
@@ -31,7 +31,7 @@ photos:
     location:
       latitude: 56.339805583333
       longitude: -2.8108503888889
-    model: HTC One S
+    model: One S
     make: HTC
   906cc7f:
     date: 2013-12-05 20:45:00
@@ -39,11 +39,7 @@ photos:
     location:
       latitude: 56.339851361111
       longitude: -2.8108281944444
-    model: HTC One S
-    sizes:
-      640w: { height: 162, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    model: One S
     make: HTC
   7915f62:
     aperture: f/2.0
@@ -51,8 +47,4 @@ photos:
     exposure: 2777/1000000
     file: IMG_20140126_143407
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-waterfall.yml b/_data/gallery/2014-waterfall.yml
index 10dc5e9..b97a891 100644
--- a/_data/gallery/2014-waterfall.yml
+++ b/_data/gallery/2014-waterfall.yml
@@ -14,10 +14,6 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   3e7b9cd:
     aperture: f/2.0
@@ -28,10 +24,6 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   4b0bb72:
     aperture: f/2.0
@@ -42,10 +34,6 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   ec15335:
     aperture: f/2.0
@@ -56,10 +44,6 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   c53ec0d:
     aperture: f/2.0
@@ -70,10 +54,6 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2e0767e:
     aperture: f/2.0
@@ -84,10 +64,6 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   97f08bc:
     aperture: f/2.0
@@ -98,10 +74,6 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   90845b2:
     aperture: f/2.0
@@ -109,10 +81,6 @@ photos:
     exposure: 50001/1000000
     file: img_20140208_144514
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d170416:
     aperture: f/2.0
@@ -120,10 +88,6 @@ photos:
     exposure: 33334/1000000
     file: img_20140208_145004
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   313fd29:
     aperture: f/2.0
@@ -131,10 +95,6 @@ photos:
     exposure: 50001/1000000
     file: img_20140208_145226
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   d8712ae:
     aperture: f/2.0
@@ -142,10 +102,6 @@ photos:
     exposure: 50001/1000000
     file: img_20140208_145325
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   2cddc0c:
     aperture: f/2.0
@@ -156,10 +112,6 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6325e87:
     aperture: f/2.0
@@ -170,118 +122,74 @@ photos:
       latitude: 56.765953055556
       longitude: -3.8941109166667
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   3e3bf20:
     aperture: f/4.0
     date: 2014-02-08 15:17:33
     exposure: 1/160
-    file: DSC00222.JPG
+    file: DSC00222
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   d04b245:
     aperture: f/4.0
     date: 2014-02-08 15:18:08
     exposure: 1/160
-    file: DSC00223.JPG
+    file: DSC00223
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   679b26a:
     aperture: f/4.0
     date: 2014-02-08 15:20:12
     exposure: 1/160
-    file: DSC00225.JPG
+    file: DSC00225
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   1ce7743:
     aperture: f/4.0
     date: 2014-02-08 15:21:23
     exposure: 1/160
-    file: DSC00226.JPG
+    file: DSC00226
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   5a327dc:
     aperture: f/4.0
     date: 2014-02-08 15:22:22
     exposure: 1/160
-    file: DSC00227.JPG
+    file: DSC00227
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   3ab2ee1:
     aperture: f/4.0
     date: 2014-02-08 15:44:30
     exposure: 1/160
-    file: DSC00229.JPG
+    file: DSC00229
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   288d0ff:
     aperture: f/4.0
     date: 2014-02-08 15:52:54
     exposure: 1/160
-    file: DSC00230.JPG
+    file: DSC00230
     model: NEX-3N
-    sizes:
-      640w: { height: 963, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   47b36af:
     aperture: f/3.5
     date: 2014-02-08 15:56:42
     exposure: 1/160
-    file: DSC00231.JPG
+    file: DSC00231
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   b1e4e52:
     aperture: f/4.5
     date: 2014-02-08 15:56:58
     exposure: 1/160
-    file: DSC00232.JPG
+    file: DSC00232
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
+    make: Sony
   f5aa1fb:
     aperture: f/4.5
     date: 2014-02-08 15:57:02
     exposure: 1/160
-    file: DSC00233.JPG
+    file: DSC00233
     model: NEX-3N
-    sizes:
-      640w: { height: 426, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SONY
\ No newline at end of file
+    make: Sony
\ No newline at end of file
diff --git a/_data/gallery/2014-whisky-tasting-1.yml b/_data/gallery/2014-whisky-tasting-1.yml
index 1072e6f..aa757cf 100644
--- a/_data/gallery/2014-whisky-tasting-1.yml
+++ b/_data/gallery/2014-whisky-tasting-1.yml
@@ -1,5 +1,6 @@
-title: whisky-tasting-1
+title: Whisky Tasting
 date: 2014-04-03
+ignore: true
 map:
   latitude: 56.3428955
   longitude: -2.8014662222222
@@ -14,8 +15,4 @@ photos:
       latitude: 56.3428955
       longitude: -2.8014662222222
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2014-whisky-tasting-2.yml b/_data/gallery/2014-whisky-tasting-2.yml
index ce88786..1300408 100644
--- a/_data/gallery/2014-whisky-tasting-2.yml
+++ b/_data/gallery/2014-whisky-tasting-2.yml
@@ -1,40 +1,27 @@
-title: whisky-tasting-2
+title: Whisky Tasting
 date: 2014-11-07
+ignore: true
 photos:
   1551ea0:
     date: 2014-11-07 08:42:02
     file: timorous-beastie-whisky
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    width: 200
   7e902cd:
     date: 2014-11-07 08:43:33
     file: dailuaine-12-year-old-1999-sherry-provenance-douglas-laing-whisky
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    width: 200
   cd53c7b:
     date: 2014-11-07 08:43:47
     file: blair-athol-15-year-old-1998-cask-10342-old-particular-douglas-laing-whisky
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    width: 200
   0a050ed:
     date: 2014-11-07 08:45:48
     file: glen-ord-21-year-old-1992-cask-9478-directors-cut-douglas-laing-whisky
-    sizes:
-      640w: { height: 961, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
   ec3e367:
     date: 2014-11-07 08:46:48
     file: invergordon-26-year-old-1988-cask-10250-the-clan-denny-douglas-laing-whisky
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
+    width: 200
   f22d317:
     date: 2014-11-07 08:47:31
     file: big-peat-whisky
-    sizes:
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+    width: 200
\ No newline at end of file
diff --git a/_data/gallery/2014-whisky-tasting.yml b/_data/gallery/2014-whisky-tasting.yml
index faa0a51..506c0cd 100644
--- a/_data/gallery/2014-whisky-tasting.yml
+++ b/_data/gallery/2014-whisky-tasting.yml
@@ -1,4 +1,4 @@
-title: whisky-tasting
+title: Whisky Tasting
 date: 2014-03-06
 photos:
   598c7ff:
@@ -7,10 +7,6 @@ photos:
     exposure: 50001/1000000
     file: IMG_20140306_192518
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   cd86d2d:
     aperture: f/2.0
@@ -18,10 +14,6 @@ photos:
     exposure: 50001/1000000
     file: IMG_20140306_192656
     model: One S
-    sizes:
-      640w: { height: 1132, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   6ef0a46:
     aperture: f/2.0
@@ -29,10 +21,6 @@ photos:
     exposure: 50001/1000000
     file: IMG_20140306_192815
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
   316804e:
     aperture: f/2.0
@@ -40,8 +28,4 @@ photos:
     exposure: 50001/1000000
     file: IMG_20140306_202040
     model: One S
-    sizes:
-      640w: { height: 362, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
     make: HTC
\ No newline at end of file
diff --git a/_data/gallery/2015-autumn-holidays.yml b/_data/gallery/2015-autumn-holidays.yml
index 512edb4..5b64b33 100644
--- a/_data/gallery/2015-autumn-holidays.yml
+++ b/_data/gallery/2015-autumn-holidays.yml
@@ -1,4 +1,4 @@
-title: autumn-holidays-2015
+title: Autumn Holidays
 date: 2015-09-13
 end_date: 2015-09-18
 photos:
@@ -7,398 +7,398 @@ photos:
     date: 2015-09-13 11:36:33
     exposure: 1/500
     file: DSC_0390
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   aa4f363:
     aperture: f/2.8
     date: 2015-09-13 13:44:53
     exposure: 1/1000
     file: DSC_0440
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   e3f8eba:
     aperture: f/2.8
     date: 2015-09-13 13:48:09
     exposure: 1/640
     file: DSC_0448
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   bc098cd:
     aperture: f/2.8
     date: 2015-09-13 14:37:56
     exposure: 1/80
     file: DSC_0467
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   1665e59:
     aperture: f/2.8
     date: 2015-09-13 14:44:52
     exposure: 1/400
     file: DSC_0478
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   1766bea:
     aperture: f/2.8
     date: 2015-09-13 16:14:52
     exposure: 1/640
     file: DSC_0516
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   d43ff62:
     aperture: f/2.8
     date: 2015-09-14 11:16:16
     exposure: 1/400
     file: DSC_0558
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   44d3ba9:
     aperture: f/2.8
     date: 2015-09-14 11:17:10
     exposure: 1/800
     file: DSC_0560
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   c9cd3f6:
     aperture: f/2.8
     date: 2015-09-14 14:06:47
     exposure: 1/800
     file: DSC_0606
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   8f1ba2d:
     aperture: f/2.8
     date: 2015-09-14 14:21:54
     exposure: 1/200
     file: DSC_0646
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   923ca41:
     aperture: f/2.8
     date: 2015-09-14 14:29:26
     exposure: 1/1000
     file: DSC_0653
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   d028121:
     aperture: f/2.8
     date: 2015-09-14 18:00:07
     exposure: 1/200
     file: DSC_0700
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   1283f2e:
     aperture: f/2.8
     date: 2015-09-15 13:04:56
     exposure: 1/200
     file: DSC_0738
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   061bd47:
     aperture: f/2.8
     date: 2015-09-15 13:15:21
     exposure: 1/200
     file: DSC_0748
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   da7f18a:
     aperture: f/2.8
     date: 2015-09-15 13:25:47
     exposure: 1/200
     file: DSC_0764
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   17f3471:
     aperture: f/2.8
     date: 2015-09-15 13:33:25
     exposure: 1/200
     file: DSC_0772-Edit
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   1e5184e:
     aperture: f/2.8
     date: 2015-09-15 13:42:57
     exposure: 1/200
     file: DSC_0777
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   bd4f7fc:
     aperture: f/2.8
     date: 2015-09-15 15:56:45
     exposure: 1/1250
     file: DSC_0857
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   7e0ca61:
     aperture: f/2.8
     date: 2015-09-15 17:31:49
     exposure: 1/400
     file: DSC_0897
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   a288da0:
     aperture: f/2.8
     date: 2015-09-15 17:32:39
     exposure: 1/640
     file: DSC_0898
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   677ee74:
     aperture: f/2.8
     date: 2015-09-15 17:34:14
     exposure: 1/640
     file: DSC_0901
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   24118eb:
     aperture: f/2.8
     date: 2015-09-15 17:54:39
     exposure: 1/400
     file: DSC_0933
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   b383b43:
     aperture: f/2.8
     date: 2015-09-16 09:42:32
     exposure: 1/640
     file: DSC_0961
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   cf5af88:
     aperture: f/2.8
     date: 2015-09-16 10:41:04
     exposure: 1/800
     file: DSC_0981
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   e905b5d:
     aperture: f/2.8
     date: 2015-09-16 11:18:37
     exposure: 1/400
     file: DSC_1011
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   cd61d1e:
     aperture: f/2.8
     date: 2015-09-16 11:19:32
     exposure: 1/640
     file: DSC_1012
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   dcfa233:
     aperture: f/2.8
     date: 2015-09-16 11:20:21
     exposure: 1/640
     file: DSC_1013
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   5d1cc2a:
     aperture: f/2.8
     date: 2015-09-16 11:55:48
     exposure: 1/200
     file: DSC_1033
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   04dc1e4:
     aperture: f/2.8
     date: 2015-09-16 11:55:51
     exposure: 1/250
     file: DSC_1034
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   3519ab6:
     aperture: f/2.8
     date: 2015-09-16 15:53:22
     exposure: 1/500
     file: DSC_1050
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   4ca3b77:
     aperture: f/3.2
     date: 2015-09-16 17:13:10
     exposure: 1/640
     file: DSC_1072
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   49b1e81:
     aperture: f/2.8
     date: 2015-09-16 17:18:03
     exposure: 1/400
     file: DSC_1079
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   e768b76:
     aperture: f/2.8
     date: 2015-09-16 17:20:13
     exposure: 1/400
     file: DSC_1084
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   4e9d026:
     aperture: f/2.8
     date: 2015-09-16 17:25:42
     exposure: 1/320
     file: DSC_1119
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   cbbdd30:
     aperture: f/2.8
     date: 2015-09-16 17:37:21
     exposure: 1/80
     file: DSC_1126
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   368ba23:
     aperture: f/2.8
     date: 2015-09-17 14:41:38
     exposure: 1/640
     file: DSC_1187
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   fac7c5d:
     aperture: f/2.8
     date: 2015-09-17 15:20:57
     exposure: 1/250
     file: DSC_1197
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   0138770:
     aperture: f/2.8
     date: 2015-09-17 15:23:41
     exposure: 1/125
     file: DSC_1200
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   c601f0f:
     aperture: f/2.8
     date: 2015-09-17 15:26:40
     exposure: 1/125
     file: DSC_1211
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   63974db:
     aperture: f/2.8
     date: 2015-09-17 15:31:58
     exposure: 1/100
     file: DSC_1213
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   fbed02a:
     aperture: f/2.8
     date: 2015-09-17 15:32:20
     exposure: 1/80
     file: DSC_1214
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   d82255d:
     aperture: f/2.8
     date: 2015-09-17 15:37:43
     exposure: 1/125
     file: DSC_1215
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   0e17e5c:
     aperture: f/2.8
     date: 2015-09-18 10:19:14
     exposure: 1/640
     file: DSC_1258
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   61f4659:
     aperture: f/2.8
     date: 2015-09-18 12:05:05
     exposure: 1/400
     file: DSC_1279
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   9a5d8f5:
     aperture: f/2.8
     date: 2015-09-18 12:32:00
     exposure: 1/500
     file: DSC_1307
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   32f7d1d:
     aperture: f/2.8
     date: 2015-09-18 13:24:26
     exposure: 1/160
     file: DSC_1314
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   d0a51f7:
     aperture: f/2.8
     date: 2015-09-18 13:34:20
     exposure: 1/800
     file: DSC_1318
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   731476e:
     aperture: f/2.8
     date: 2015-09-18 13:35:51
     exposure: 1/320
     file: DSC_1319
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   3395610:
     aperture: f/2.8
     date: 2015-09-18 13:37:48
     exposure: 1/1000
     file: DSC_1321
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
+    make: Nikon
   138b512:
     aperture: f/2.8
     date: 2015-09-18 18:27:33
     exposure: 1/125
     file: DSC_1360
-    model: NIKON D3100
+    model: D3100
     width: 1920
-    make: NIKON CORPORATION
\ No newline at end of file
+    make: Nikon
\ No newline at end of file
diff --git a/_data/gallery/2015-autumn-runs.yml b/_data/gallery/2015-autumn-runs.yml
index ed6bde4..92a05a4 100644
--- a/_data/gallery/2015-autumn-runs.yml
+++ b/_data/gallery/2015-autumn-runs.yml
@@ -1,10 +1,12 @@
-title: autumn-runs
+title: Autumn Runs
 date: 2015-10-05
+ignore: true
 photos:
+  ca6526c:
+    date: 2015-10-04 16:20:00
+    width: 200
+  41289fc:
+    date: 2015-10-05 11:30:00
   fb7e1d4:
     date: 2015-10-05 09:29:21
-    file: IMG_9452.JPG
-    sizes:
-      640w: { height: 919, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+    file: IMG_9452
\ No newline at end of file
diff --git a/_data/gallery/2015-birthday-holidays.yml b/_data/gallery/2015-birthday-holidays.yml
index fc5e502..6d67355 100644
--- a/_data/gallery/2015-birthday-holidays.yml
+++ b/_data/gallery/2015-birthday-holidays.yml
@@ -1,15 +1,10 @@
-title: birthday-holidays-2015
+title: Birthday Hlidays
 date: 2015-05-30
 photos:
   315dacc:
     aperture: f/5.4
     date: 2015-05-30 15:12:47
     exposure: 1/750
-    file: SAM_7122.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      1920x1080: { height: 1080, width: 1920 }
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_7122
+    model: WB600
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2015-botanical-garden.yml b/_data/gallery/2015-botanical-garden.yml
index 3ff0d6d..c7ab05e 100644
--- a/_data/gallery/2015-botanical-garden.yml
+++ b/_data/gallery/2015-botanical-garden.yml
@@ -1,4 +1,4 @@
-title: botanical-garden
+title: Botanical Garden
 date: 2015-04-11
 map:
   latitude: 56.335407694444
@@ -53,10 +53,6 @@ photos:
     location:
       latitude: 56.335571277778
       longitude: -2.8036031666667
-    sizes:
-      640w: { height: 864, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
   a60f94d:
     date: 2015-04-11 12:05:10
     file: IMG_20150411_120509
@@ -64,9 +60,6 @@ photos:
       latitude: 56.335571277778
       longitude: -2.8036031666667
     sizes:
-      640w: { height: 864, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
   7e47922:
     date: 2015-04-11 12:07:02
     file: IMG_20150411_120701
@@ -108,26 +101,15 @@ photos:
       latitude: 56.334415416667
       longitude: -2.8056463611111
     sizes:
-      640w: { height: 864, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
   ca7e7a5:
     date: 2015-04-11 12:20:18
     file: IMG_20150411_122018
     location:
       latitude: 56.334415416667
       longitude: -2.8056463611111
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
   9560dd0:
     date: 2015-04-11 12:22:52
     file: IMG_20150411_122252
     location:
       latitude: 56.334415416667
-      longitude: -2.8056463611111
-    sizes:
-      640w: { height: 475, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+      longitude: -2.8056463611111
\ No newline at end of file
diff --git a/_data/gallery/2015-christmas-holidays.yml b/_data/gallery/2015-christmas-holidays.yml
index da80011..1de2a6f 100644
--- a/_data/gallery/2015-christmas-holidays.yml
+++ b/_data/gallery/2015-christmas-holidays.yml
@@ -29,55 +29,35 @@ photos:
     exposure: 1/40
     file: 2014-12-25 19.11.53
     model: Nexus 5
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   75afdba:
     aperture: f/2.4
     date: 2014-12-25 19:16:12
     exposure: 1/121
     file: 2014-12-25 19.16.12
     model: Nexus 5
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   25959d9:
     aperture: f/2.4
     date: 2014-12-25 20:00:12
     exposure: 1/211
     file: 2014-12-25 20.00.12
     model: Nexus 5
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   69c75ad:
     aperture: f/2.4
     date: 2014-12-26 17:18:07
     exposure: 1/24
     file: 2014-12-26 17.18.07
     model: Nexus 5
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   4bc0aa0:
     aperture: f/2.4
     date: 2014-12-26 19:24:48
     exposure: 1/199
     file: 2014-12-26 19.24.48
     model: Nexus 5
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: LGE
+    make: LG
   0093145:
     aperture: f/3.6
     date: 2015-12-25 09:14:03
diff --git a/_data/gallery/2015-coastal-path.yml b/_data/gallery/2015-coastal-path.yml
index 3eb6883..8d15103 100644
--- a/_data/gallery/2015-coastal-path.yml
+++ b/_data/gallery/2015-coastal-path.yml
@@ -1,4 +1,4 @@
-title: coastal-path-1
+title: Coastal Path
 date: 2015-12-06
 photos:
   5d54754:
@@ -6,7 +6,7 @@ photos:
     date: 2015-12-06 12:38:16
     exposure: 1/1700
     file: IMG_20151206_123815
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d56aac5:
@@ -14,7 +14,7 @@ photos:
     date: 2015-12-06 12:39:41
     exposure: 1/430
     file: IMG_20151206_123939
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7ca003c:
@@ -22,7 +22,7 @@ photos:
     date: 2015-12-06 12:39:55
     exposure: 1/1150
     file: IMG_20151206_123953
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   5812954:
@@ -30,7 +30,7 @@ photos:
     date: 2015-12-06 12:50:24
     exposure: 1/640
     file: IMG_20151206_125023
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f27a020:
@@ -38,7 +38,7 @@ photos:
     date: 2015-12-06 12:53:25
     exposure: 1/100
     file: IMG_20151206_125323
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   47a644a:
@@ -46,7 +46,7 @@ photos:
     date: 2015-12-06 12:55:45
     exposure: 1/60
     file: IMG_20151206_125544
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 1138, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -57,7 +57,7 @@ photos:
     date: 2015-12-06 12:57:18
     exposure: 1/1100
     file: IMG_20151206_125716
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   995ab3e:
@@ -65,7 +65,7 @@ photos:
     date: 2015-12-06 13:00:12
     exposure: 1/1500
     file: IMG_20151206_130011
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ad5058e:
@@ -73,7 +73,7 @@ photos:
     date: 2015-12-06 13:01:36
     exposure: 1/1700
     file: IMG_20151206_130134
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0b83b43:
@@ -81,7 +81,7 @@ photos:
     date: 2015-12-06 13:02:13
     exposure: 1/800
     file: IMG_20151206_130211
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9e8c3c5:
@@ -89,7 +89,7 @@ photos:
     date: 2015-12-06 13:02:26
     exposure: 1/610
     file: IMG_20151206_130224
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   97f4b34:
@@ -97,7 +97,7 @@ photos:
     date: 2015-12-06 13:04:01
     exposure: 1/100
     file: IMG_20151206_130400
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   cb8de14:
@@ -109,7 +109,7 @@ photos:
     date: 2015-12-06 13:22:56
     exposure: 1/610
     file: IMG_20151206_132255
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7cbe71e:
@@ -117,7 +117,7 @@ photos:
     date: 2015-12-06 13:30:25
     exposure: 1/1700
     file: IMG_20151206_133023
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dc64be0:
@@ -125,7 +125,7 @@ photos:
     date: 2015-12-06 13:31:31
     exposure: 1/750
     file: IMG_20151206_133129
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6a565da:
@@ -133,7 +133,7 @@ photos:
     date: 2015-12-06 13:32:43
     exposure: 1/2000
     file: IMG_20151206_133242
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   1bacc31:
@@ -141,7 +141,7 @@ photos:
     date: 2015-12-06 13:33:08
     exposure: 1/800
     file: IMG_20151206_133306
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   cb5ee4b:
@@ -149,7 +149,7 @@ photos:
     date: 2015-12-06 13:36:13
     exposure: 1/500
     file: IMG_20151206_133611
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f72dce0:
@@ -157,7 +157,7 @@ photos:
     date: 2015-12-06 13:39:56
     exposure: 1/500
     file: IMG_20151206_133954
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   5a8313a:
@@ -165,7 +165,7 @@ photos:
     date: 2015-12-06 13:42:17
     exposure: 1/670
     file: IMG_20151206_134215
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ae75771:
@@ -173,7 +173,7 @@ photos:
     date: 2015-12-06 13:42:35
     exposure: 1/670
     file: IMG_20151206_134234
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   cc317c6:
@@ -181,7 +181,7 @@ photos:
     date: 2015-12-06 13:43:42
     exposure: 1/310
     file: IMG_20151206_134341
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d0eec75:
@@ -189,7 +189,7 @@ photos:
     date: 2015-12-06 13:57:26
     exposure: 1/500
     file: IMG_20151206_135725
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   afc5007:
@@ -197,7 +197,7 @@ photos:
     date: 2015-12-06 14:02:19
     exposure: 1/610
     file: IMG_20151206_140218
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a1dea1f:
@@ -205,7 +205,7 @@ photos:
     date: 2015-12-06 14:02:55
     exposure: 1/750
     file: IMG_20151206_140253
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   5a8040f:
@@ -213,6 +213,6 @@ photos:
     date: 2015-12-06 14:09:39
     exposure: 1/500
     file: IMG_20151206_140938
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-glen-clova-david.yml b/_data/gallery/2015-glen-clova-david.yml
index 858ec68..4b6ffc9 100644
--- a/_data/gallery/2015-glen-clova-david.yml
+++ b/_data/gallery/2015-glen-clova-david.yml
@@ -1,5 +1,6 @@
-title: glen-clova-david
+title: Glen Clova - David
 date: 2015-10-11
+ignore: true
 photos:
   f062567:
     date: 2015-10-11 19:24:15
diff --git a/_data/gallery/2015-glen-clova.yml b/_data/gallery/2015-glen-clova.yml
index 3251a27..752a195 100644
--- a/_data/gallery/2015-glen-clova.yml
+++ b/_data/gallery/2015-glen-clova.yml
@@ -1,4 +1,4 @@
-title: glen-clova
+title: Glen Clova
 date: 2015-10-10
 end_date: 2015-10-12
 map:
@@ -11,7 +11,7 @@ photos:
     date: 2015-10-10 10:38:38
     exposure: 1/230
     file: IMG_20151010_103836
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   43ddb97:
@@ -19,7 +19,7 @@ photos:
     date: 2015-10-10 10:52:57
     exposure: 1/150
     file: IMG_20151010_105256
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d5d2647:
@@ -27,7 +27,7 @@ photos:
     date: 2015-10-10 10:59:51
     exposure: 1/290
     file: IMG_20151010_105949
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9090148:
@@ -35,7 +35,7 @@ photos:
     date: 2015-10-10 11:02:03
     exposure: 1/100
     file: IMG_20151010_110201
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   cdebcd4:
@@ -43,7 +43,7 @@ photos:
     date: 2015-10-10 11:02:09
     exposure: 1/100
     file: IMG_20151010_110207
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c338648:
@@ -51,7 +51,7 @@ photos:
     date: 2015-10-10 11:07:20
     exposure: 1/240
     file: IMG_20151010_110718
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0de1ee2:
@@ -59,7 +59,7 @@ photos:
     date: 2015-10-10 11:17:08
     exposure: 1/125
     file: IMG_20151010_111707
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f6708b9:
@@ -67,7 +67,7 @@ photos:
     date: 2015-10-10 12:15:11
     exposure: 1/500
     file: IMG_20151010_121509
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   03c8746:
@@ -75,7 +75,7 @@ photos:
     date: 2015-10-10 12:29:26
     exposure: 1/610
     file: IMG_20151010_122924
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6e8e3ea:
@@ -83,7 +83,7 @@ photos:
     date: 2015-10-10 12:29:32
     exposure: 1/800
     file: IMG_20151010_122930
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f9af05d:
@@ -91,7 +91,7 @@ photos:
     date: 2015-10-10 12:32:06
     exposure: 1/900
     file: IMG_20151010_123204
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c6265e4:
@@ -99,7 +99,7 @@ photos:
     date: 2015-10-10 12:38:00
     exposure: 1/400
     file: IMG_20151010_123758
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6ececfd:
@@ -107,7 +107,7 @@ photos:
     date: 2015-10-10 13:02:38
     exposure: 1/370
     file: IMG_20151010_130236
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2ec11ae:
@@ -115,7 +115,7 @@ photos:
     date: 2015-10-10 13:06:00
     exposure: 1/460
     file: IMG_20151010_130558
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2b7b9a7:
@@ -123,7 +123,7 @@ photos:
     date: 2015-10-10 13:11:31
     exposure: 1/200
     file: IMG_20151010_131129
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6dd706c:
@@ -131,7 +131,7 @@ photos:
     date: 2015-10-10 13:22:18
     exposure: 1/400
     file: IMG_20151010_132216
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   995abe1:
@@ -139,7 +139,7 @@ photos:
     date: 2015-10-10 13:24:05
     exposure: 1/350
     file: IMG_20151010_132403
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   36c5105:
@@ -147,7 +147,7 @@ photos:
     date: 2015-10-10 13:27:49
     exposure: 1/200
     file: IMG_20151010_132747
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   300c7e1:
@@ -155,7 +155,7 @@ photos:
     date: 2015-10-10 13:29:53
     exposure: 1/450
     file: IMG_20151010_132951
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   8bdce1b:
@@ -163,7 +163,7 @@ photos:
     date: 2015-10-10 13:30:17
     exposure: 1/370
     file: IMG_20151010_133015
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   09622f0:
@@ -171,7 +171,7 @@ photos:
     date: 2015-10-10 13:45:25
     exposure: 1/290
     file: IMG_20151010_134523
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9458403:
@@ -189,7 +189,7 @@ photos:
     date: 2015-10-10 13:49:30
     exposure: 1/400
     file: IMG_20151010_134928
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ca520aa:
@@ -197,7 +197,7 @@ photos:
     date: 2015-10-10 13:53:44
     exposure: 1/150
     file: IMG_20151010_135342
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e9d59f8:
@@ -205,7 +205,7 @@ photos:
     date: 2015-10-10 14:00:10
     exposure: 1/290
     file: IMG_20151010_140008
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   3231f8e:
@@ -213,7 +213,7 @@ photos:
     date: 2015-10-10 14:04:43
     exposure: 1/270
     file: IMG_20151010_140441
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9810349:
@@ -221,7 +221,7 @@ photos:
     date: 2015-10-10 14:06:33
     exposure: 1/380
     file: IMG_20151010_140631
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   8996cf6:
@@ -229,7 +229,7 @@ photos:
     date: 2015-10-10 14:13:56
     exposure: 1/35
     file: IMG_20151010_141354
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a2ebd0c:
@@ -237,7 +237,7 @@ photos:
     date: 2015-10-10 14:16:08
     exposure: 1/280
     file: IMG_20151010_141606
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   651e2a2:
@@ -245,7 +245,7 @@ photos:
     date: 2015-10-10 14:35:13
     exposure: 1/35
     file: IMG_20151010_143511
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ec86082:
@@ -253,7 +253,7 @@ photos:
     date: 2015-10-10 14:37:13
     exposure: 1/120
     file: IMG_20151010_143711
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   5388b77:
@@ -261,7 +261,7 @@ photos:
     date: 2015-10-10 14:39:00
     exposure: 1/50
     file: IMG_20151010_143859
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c016041:
@@ -269,7 +269,7 @@ photos:
     date: 2015-10-10 14:43:06
     exposure: 1/25
     file: IMG_20151010_144304
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   41169d3:
@@ -277,7 +277,7 @@ photos:
     date: 2015-10-10 14:46:21
     exposure: 1/120
     file: IMG_20151010_144619
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   016d723:
@@ -285,7 +285,7 @@ photos:
     date: 2015-10-10 15:12:09
     exposure: 1/60
     file: IMG_20151010_151207
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   bd673ad:
diff --git a/_data/gallery/2015-kingsbarns-distillery.yml b/_data/gallery/2015-kingsbarns-distillery.yml
index e985752..8ad1d66 100644
--- a/_data/gallery/2015-kingsbarns-distillery.yml
+++ b/_data/gallery/2015-kingsbarns-distillery.yml
@@ -1,4 +1,4 @@
-title: kingsbarns-distillery
+title: Kingsbarns Distillery
 date: 2015-10-11
 map:
   latitude: 56.287241601852
@@ -10,68 +10,33 @@ photos:
     date: 2015-10-11 12:09:10
     exposure: 1/430
     file: IMG_20151011_120908
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6d78d25:
     date: 2015-10-11 12:33:42
-    file: IMG_20151011_123341
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  754c91a:
+    file: IMG_20151011_123341  754c91a:
     date: 2015-10-11 12:43:35
-    file: IMG_20151011_124334
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  83b96af:
+    file: IMG_20151011_124334  83b96af:
     date: 2015-10-11 12:43:48
-    file: IMG_20151011_124347
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  c09afdb:
+    file: IMG_20151011_124347  c09afdb:
     date: 2015-10-11 12:45:58
-    file: IMG_20151011_124557
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  908f32b:
+    file: IMG_20151011_124557  908f32b:
     date: 2015-10-11 13:10:56
     file: IMG_20151011_131055
     location:
       latitude: 56.287509916667
-      longitude: -2.6425761944444
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  a0808fe:
+      longitude: -2.6425761944444  a0808fe:
     date: 2015-10-11 13:11:09
     file: IMG_20151011_131108
     location:
       latitude: 56.287113166667
-      longitude: -2.6430730555556
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  6dbb83c:
+      longitude: -2.6430730555556  6dbb83c:
     date: 2015-10-11 13:11:28
     file: IMG_20151011_131127
     location:
       latitude: 56.287101722222
-      longitude: -2.6430899722222
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  98c799a:
+      longitude: -2.6430899722222  98c799a:
     date: 2015-10-11 13:46:51
     file: IMG_20151011_134651
     sizes:
diff --git a/_data/gallery/2015-northen-ireland-belfast.yml b/_data/gallery/2015-northen-ireland-belfast.yml
index cd54997..1d3a60b 100644
--- a/_data/gallery/2015-northen-ireland-belfast.yml
+++ b/_data/gallery/2015-northen-ireland-belfast.yml
@@ -1,4 +1,4 @@
-title: northen-ireland-2015-belfast
+title: Northern Ireland - Belfast
 date: 2015-08-15
 photos:
   989e196:
@@ -6,7 +6,7 @@ photos:
     date: 2015-08-15 10:31:27
     exposure: 1/60
     file: IMG_20150815_103125
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e05d52c:
@@ -14,7 +14,7 @@ photos:
     date: 2015-08-15 10:47:01
     exposure: 1/640
     file: IMG_20150815_104659
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   24d65ef:
@@ -22,7 +22,7 @@ photos:
     date: 2015-08-15 10:58:56
     exposure: 1/900
     file: IMG_20150815_105854
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0854894:
@@ -30,7 +30,7 @@ photos:
     date: 2015-08-15 11:14:16
     exposure: 1/1700
     file: IMG_20150815_111414
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a2ea4b9:
@@ -38,7 +38,7 @@ photos:
     date: 2015-08-15 11:19:00
     exposure: 1/1900
     file: IMG_20150815_111858
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f7e9499:
@@ -46,7 +46,7 @@ photos:
     date: 2015-08-15 11:25:15
     exposure: 1/2000
     file: IMG_20150815_112513
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9ac173f:
@@ -54,7 +54,7 @@ photos:
     date: 2015-08-15 11:28:01
     exposure: 1/1700
     file: IMG_20150815_112759
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 864, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -65,7 +65,7 @@ photos:
     date: 2015-08-15 11:31:33
     exposure: 1/2200
     file: IMG_20150815_113131
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   80505ce:
@@ -73,7 +73,7 @@ photos:
     date: 2015-08-15 11:43:25
     exposure: 1/1200
     file: IMG_20150815_114323
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   8f5eeac:
@@ -81,7 +81,7 @@ photos:
     date: 2015-08-15 12:07:47
     exposure: 1/1400
     file: IMG_20150815_120745
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 864, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -92,14 +92,14 @@ photos:
     date: 2015-08-15 12:14:16
     exposure: 1/1000
     file: IMG_20150815_121414
-    model: One A0001
+    model: One
     make: OnePlus
   11e4bd1:
     aperture: f/2.0
     date: 2015-08-15 12:21:10
     exposure: 1/2600
     file: IMG_20150815_122108
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 864, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -110,7 +110,7 @@ photos:
     date: 2015-08-15 12:26:27
     exposure: 1/1300
     file: IMG_20150815_122625
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   877eb19:
@@ -118,7 +118,7 @@ photos:
     date: 2015-08-15 12:46:14
     exposure: 1/6
     file: IMG_20150815_124612
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e3c212b:
@@ -126,7 +126,7 @@ photos:
     date: 2015-08-15 13:33:15
     exposure: 1/950
     file: IMG_20150815_133312
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d45abe8:
@@ -134,7 +134,7 @@ photos:
     date: 2015-08-15 14:04:47
     exposure: 1/1250
     file: IMG_20150815_140445
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e465aa1:
@@ -142,7 +142,7 @@ photos:
     date: 2015-08-15 14:19:31
     exposure: 1/35
     file: IMG_20150815_141929
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f57c1c6:
@@ -150,7 +150,7 @@ photos:
     date: 2015-08-15 14:25:14
     exposure: 1/17
     file: IMG_20150815_142512
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 445, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -161,14 +161,14 @@ photos:
     date: 2015-08-15 14:26:53
     exposure: 1/17
     file: IMG_20150815_142651
-    model: One A0001
+    model: One
     make: OnePlus
   9b828a3:
     aperture: f/2.0
     date: 2015-08-15 14:29:25
     exposure: 1/35
     file: IMG_20150815_142923
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 1030, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -179,7 +179,7 @@ photos:
     date: 2015-08-15 14:29:42
     exposure: 1/35
     file: IMG_20150815_142940
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 966, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -190,7 +190,7 @@ photos:
     date: 2015-08-15 14:33:25
     exposure: 1/170
     file: IMG_20150815_143323
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c9b2717:
@@ -198,7 +198,7 @@ photos:
     date: 2015-08-15 14:38:13
     exposure: 1/210
     file: IMG_20150815_143811
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   523b477:
@@ -206,7 +206,7 @@ photos:
     date: 2015-08-15 14:43:03
     exposure: 1/320
     file: IMG_20150815_144301
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7a9e956:
@@ -214,7 +214,7 @@ photos:
     date: 2015-08-15 15:01:01
     exposure: 1/1500
     file: IMG_20150815_150059
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ad3a529:
@@ -222,7 +222,7 @@ photos:
     date: 2015-08-15 15:05:40
     exposure: 1/60
     file: IMG_20150815_150538
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d38c3b3:
@@ -230,7 +230,7 @@ photos:
     date: 2015-08-15 15:08:43
     exposure: 1/750
     file: IMG_20150815_150841
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   85c9cb9:
@@ -238,7 +238,7 @@ photos:
     date: 2015-08-15 15:12:37
     exposure: 1/130
     file: IMG_20150815_151235
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9029196:
@@ -246,7 +246,7 @@ photos:
     date: 2015-08-15 15:14:22
     exposure: 1/1000
     file: IMG_20150815_151421
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2bc7bd6:
@@ -254,7 +254,7 @@ photos:
     date: 2015-08-15 16:08:01
     exposure: 1/17
     file: IMG_20150815_160759
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f9a4730:
@@ -262,7 +262,7 @@ photos:
     date: 2015-08-15 16:28:43
     exposure: 1/25
     file: IMG_20150815_162842
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e36f253:
@@ -270,7 +270,7 @@ photos:
     date: 2015-08-15 16:30:53
     exposure: 1/17
     file: IMG_20150815_163051
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2640fdb:
@@ -278,7 +278,7 @@ photos:
     date: 2015-08-15 16:34:56
     exposure: 1/100
     file: IMG_20150815_163454
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7a7b560:
@@ -286,7 +286,7 @@ photos:
     date: 2015-08-15 16:35:01
     exposure: 1/50
     file: IMG_20150815_163500
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   379c813:
@@ -294,7 +294,7 @@ photos:
     date: 2015-08-15 16:37:52
     exposure: 1/50
     file: IMG_20150815_163750
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9746153:
@@ -302,6 +302,6 @@ photos:
     date: 2015-08-15 16:42:52
     exposure: 1/6
     file: IMG_20150815_164250
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-northen-ireland-dark-hedges.yml b/_data/gallery/2015-northen-ireland-dark-hedges.yml
index d4296c4..eec88bb 100644
--- a/_data/gallery/2015-northen-ireland-dark-hedges.yml
+++ b/_data/gallery/2015-northen-ireland-dark-hedges.yml
@@ -1,12 +1,13 @@
-title: northen-ireland-2015-dark-hedges
+title: Northern Ireland - Dark Hedges
 date: 2015-08-16
+ignore: true
 photos:
   496d2a0:
     aperture: f/2.0
     date: 2015-08-16 17:37:26
     exposure: 1/160
     file: IMG_20150816_173724
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f71d0d4:
@@ -14,6 +15,6 @@ photos:
     date: 2015-08-16 17:37:56
     exposure: 1/240
     file: IMG_20150816_173754
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-northen-ireland-giants-causeway.yml b/_data/gallery/2015-northen-ireland-giants-causeway.yml
index 33aa02a..45c7f16 100644
--- a/_data/gallery/2015-northen-ireland-giants-causeway.yml
+++ b/_data/gallery/2015-northen-ireland-giants-causeway.yml
@@ -1,4 +1,4 @@
-title: northen-ireland-2015-giants-causeway
+title: Northern Ireland - Giant's Causeway
 date: 2015-08-16
 photos:
   1b3c5a9:
@@ -6,7 +6,7 @@ photos:
     date: 2015-08-16 15:34:23
     exposure: 1/1300
     file: IMG_20150816_153421
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e9d1ade:
@@ -14,7 +14,7 @@ photos:
     date: 2015-08-16 15:41:35
     exposure: 1/1250
     file: IMG_20150816_154133
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dc3545e:
@@ -22,7 +22,7 @@ photos:
     date: 2015-08-16 15:42:39
     exposure: 1/1050
     file: IMG_20150816_154236
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0a3b080:
@@ -30,7 +30,7 @@ photos:
     date: 2015-08-16 15:44:46
     exposure: 1/670
     file: IMG_20150816_154444
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   db623be:
@@ -38,7 +38,7 @@ photos:
     date: 2015-08-16 15:50:09
     exposure: 1/1250
     file: IMG_20150816_155007
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dc3a457:
@@ -46,7 +46,7 @@ photos:
     date: 2015-08-16 15:53:22
     exposure: 1/550
     file: IMG_20150816_155320
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9a768e0:
@@ -54,7 +54,7 @@ photos:
     date: 2015-08-16 16:06:38
     exposure: 1/1100
     file: IMG_20150816_160636
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   5f0da78:
@@ -62,7 +62,7 @@ photos:
     date: 2015-08-16 16:11:12
     exposure: 1/1400
     file: IMG_20150816_161110
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   313eb3b:
@@ -70,7 +70,7 @@ photos:
     date: 2015-08-16 16:12:13
     exposure: 1/750
     file: IMG_20150816_161211
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 864, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -81,7 +81,7 @@ photos:
     date: 2015-08-16 16:12:32
     exposure: 1/1500
     file: IMG_20150816_161230
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   bed05dc:
@@ -89,7 +89,7 @@ photos:
     date: 2015-08-16 16:13:26
     exposure: 1/270
     file: IMG_20150816_161324
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   548e3e3:
@@ -97,7 +97,7 @@ photos:
     date: 2015-08-16 16:14:41
     exposure: 1/670
     file: IMG_20150816_161439
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   952ccb4:
@@ -105,7 +105,7 @@ photos:
     date: 2015-08-16 16:17:21
     exposure: 1/670
     file: IMG_20150816_161719
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   77089c9:
@@ -113,7 +113,7 @@ photos:
     date: 2015-08-16 16:20:33
     exposure: 1/110
     file: IMG_20150816_162031
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a9e526c:
@@ -121,7 +121,7 @@ photos:
     date: 2015-08-16 16:28:59
     exposure: 1/600
     file: IMG_20150816_162857
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a600bd7:
@@ -129,7 +129,7 @@ photos:
     date: 2015-08-16 16:35:15
     exposure: 1/1050
     file: IMG_20150816_163512
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   144ed6a:
@@ -137,7 +137,7 @@ photos:
     date: 2015-08-16 16:41:37
     exposure: 1/800
     file: IMG_20150816_164135
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f567812:
@@ -145,7 +145,7 @@ photos:
     date: 2015-08-16 16:41:42
     exposure: 1/750
     file: IMG_20150816_164140
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0fedd32:
@@ -153,6 +153,6 @@ photos:
     date: 2015-08-16 16:41:47
     exposure: 1/1400
     file: IMG_20150816_164145
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-peugeot-206-fuel.yml b/_data/gallery/2015-peugeot-206-fuel.yml
index 4870926..77238bb 100644
--- a/_data/gallery/2015-peugeot-206-fuel.yml
+++ b/_data/gallery/2015-peugeot-206-fuel.yml
@@ -1,4 +1,4 @@
-title: null
+title: Peugeot 206 - Fuel
 date: 2015-12-23
 map:
   latitude: 56.330431666667
@@ -13,7 +13,7 @@ photos:
     location:
       latitude: 56.330471666667
       longitude: -2.8097683333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   390d4f5:
@@ -24,6 +24,6 @@ photos:
     location:
       latitude: 56.330391666667
       longitude: -2.80981
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-peugeot-206.yml b/_data/gallery/2015-peugeot-206.yml
index e1c1234..0caa74f 100644
--- a/_data/gallery/2015-peugeot-206.yml
+++ b/_data/gallery/2015-peugeot-206.yml
@@ -1,4 +1,4 @@
-title: null
+title: Peugeot 206
 date: 2015-12-23
 map:
   latitude: 56.381818888889
@@ -13,7 +13,7 @@ photos:
     location:
       latitude: 56.407543333333
       longitude: -2.8889383333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   3592b0b:
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.407508333333
       longitude: -2.8890733333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   11a3b22:
@@ -35,7 +35,7 @@ photos:
     location:
       latitude: 56.407513333333
       longitude: -2.889055
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   4cee1b3:
@@ -46,7 +46,7 @@ photos:
     location:
       latitude: 56.407508333333
       longitude: -2.8890166666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   29bb256:
@@ -57,6 +57,6 @@ photos:
     location:
       latitude: 56.330448333333
       longitude: -2.8097783333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-renault-megane.yml b/_data/gallery/2015-renault-megane.yml
index 6a0a38f..165ed9c 100644
--- a/_data/gallery/2015-renault-megane.yml
+++ b/_data/gallery/2015-renault-megane.yml
@@ -1,5 +1,6 @@
-title: null
+title: Renault Megane
 date: 2015-12-11
+ignore: true
 map:
   latitude: 56.329675666667
   longitude: -2.8011930972222
@@ -11,19 +12,9 @@ photos:
     location:
       latitude: 56.329715722222
       longitude: -2.8011831666667
-    sizes:
-      1920x1080: { height: 1080, width: 1920 }
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
   9f0f9a2:
     date: 2015-12-11 15:23:50
     file: IMG_20151211_152349
     location:
       latitude: 56.329635611111
-      longitude: -2.8012030277778
-    sizes:
-      1920x1080: { height: 1080, width: 1920 }
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
\ No newline at end of file
+      longitude: -2.8012030277778
\ No newline at end of file
diff --git a/_data/gallery/2015-round-the-houses.yml b/_data/gallery/2015-round-the-houses.yml
index c4342a3..74db8ba 100644
--- a/_data/gallery/2015-round-the-houses.yml
+++ b/_data/gallery/2015-round-the-houses.yml
@@ -1,4 +1,4 @@
-title: round-the-houses
+title: Round the Houses
 date: 2015-04-13
 photos:
   f848391:
diff --git a/_data/gallery/2015-seat-ibiza-heat-shield.yml b/_data/gallery/2015-seat-ibiza-heat-shield.yml
index deb7c1c..f3dac6e 100644
--- a/_data/gallery/2015-seat-ibiza-heat-shield.yml
+++ b/_data/gallery/2015-seat-ibiza-heat-shield.yml
@@ -1,4 +1,4 @@
-title: seat-ibiza-heat-shield
+title: Seat Ibiza - Heat Shield
 date: 2015-08-23
 end_date: 2015-08-26
 map:
@@ -9,31 +9,17 @@ photos:
   64751cd:
     date: 2015-08-23 18:09:17
     file: IMG_20150823_180916
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
   3cb29a9:
     date: 2015-08-26 08:16:05
     file: IMG_20150826_081604
     location:
       latitude: 56.330387111111
-      longitude: -2.8098017777778
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  64e4ca4:
+      longitude: -2.8098017777778  64e4ca4:
     date: 2015-08-26 08:23:37
     file: IMG_20150826_082336
     location:
       latitude: 56.330368027778
-      longitude: -2.8097918055556
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  b607f9c:
+      longitude: -2.8097918055556  b607f9c:
     date: 2015-08-26 08:23:50
     file: IMG_20150826_082349
     location:
diff --git a/_data/gallery/2015-solar-eclipse.yml b/_data/gallery/2015-solar-eclipse.yml
index 4d1476f..9896113 100644
--- a/_data/gallery/2015-solar-eclipse.yml
+++ b/_data/gallery/2015-solar-eclipse.yml
@@ -1,4 +1,4 @@
-title: solar-eclipse
+title: Solar Eclipse
 date: 2015-03-20
 map:
   latitude: 56.339781611111
@@ -22,12 +22,7 @@ photos:
     file: IMG_20150320_092545
     location:
       latitude: 56.339778888889
-      longitude: -2.8074831388889
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-  ed14c6b:
+      longitude: -2.8074831388889  ed14c6b:
     date: 2015-03-20 09:30:10
     file: IMG_20150320_093008
     location:
diff --git a/_data/gallery/2015-spain-barcelona-stores.yml b/_data/gallery/2015-spain-barcelona-stores.yml
index 35fc7e5..41a0383 100644
--- a/_data/gallery/2015-spain-barcelona-stores.yml
+++ b/_data/gallery/2015-spain-barcelona-stores.yml
@@ -1,4 +1,4 @@
-title: Spain - Barcelona stores
+title: Spain - Barcelona Stores
 date: 2015-07-03
 end_date: 2015-07-04
 map:
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 41.381203333333
       longitude: 2.175225
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d1918cb:
@@ -25,7 +25,7 @@ photos:
     location:
       latitude: 41.381206666667
       longitude: 2.17523
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e39b91b:
@@ -36,7 +36,7 @@ photos:
     location:
       latitude: 41.38398
       longitude: 2.177475
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2abe2ca:
@@ -47,7 +47,7 @@ photos:
     location:
       latitude: 41.375705
       longitude: 2.1775483333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a964616:
@@ -58,7 +58,7 @@ photos:
     location:
       latitude: 41.381881666667
       longitude: 2.17185
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d1b8525:
@@ -69,7 +69,7 @@ photos:
     location:
       latitude: 41.38189
       longitude: 2.1718583333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   cae21ca:
@@ -80,7 +80,7 @@ photos:
     location:
       latitude: 41.381893333333
       longitude: 2.1718616666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d3268a4:
@@ -91,7 +91,7 @@ photos:
     location:
       latitude: 41.381893333333
       longitude: 2.1718616666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   b286203:
@@ -102,7 +102,7 @@ photos:
     location:
       latitude: 41.383465
       longitude: 2.18208
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   901da28:
@@ -113,7 +113,7 @@ photos:
     location:
       latitude: 41.383808333333
       longitude: 2.1775816666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a847e58:
@@ -124,7 +124,7 @@ photos:
     location:
       latitude: 41.384163333333
       longitude: 2.17883
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   414250a:
@@ -135,7 +135,7 @@ photos:
     location:
       latitude: 41.384125
       longitude: 2.1787433333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   005de5b:
@@ -146,7 +146,7 @@ photos:
     location:
       latitude: 41.391765
       longitude: 2.1653066666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   4bd050e:
@@ -157,6 +157,6 @@ photos:
     location:
       latitude: 41.391765
       longitude: 2.1653066666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-spain-barcelona.yml b/_data/gallery/2015-spain-barcelona.yml
index d4e4e45..516ccd1 100644
--- a/_data/gallery/2015-spain-barcelona.yml
+++ b/_data/gallery/2015-spain-barcelona.yml
@@ -1,4 +1,4 @@
-title: spain-2015-barcelona
+title: Spain - Barcelona
 date: 2015-07-03
 end_date: 2015-07-04
 map:
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 41.393448333333
       longitude: 2.1686066666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d1c6b11:
@@ -25,7 +25,7 @@ photos:
     location:
       latitude: 41.387111666667
       longitude: 2.1709366666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e6dfaa0:
@@ -36,7 +36,7 @@ photos:
     location:
       latitude: 41.387156666667
       longitude: 2.1700833333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   cbcef0b:
@@ -47,7 +47,7 @@ photos:
     location:
       latitude: 41.38435
       longitude: 2.1779766666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ba9b8b1:
@@ -58,7 +58,7 @@ photos:
     location:
       latitude: 41.384491666667
       longitude: 2.1761183333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   73f0e2f:
@@ -69,7 +69,7 @@ photos:
     location:
       latitude: 41.384491666667
       longitude: 2.1761183333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c9b37e9:
@@ -80,7 +80,7 @@ photos:
     location:
       latitude: 41.383971666667
       longitude: 2.1774466666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   fa8a15e:
@@ -91,7 +91,7 @@ photos:
     location:
       latitude: 41.38398
       longitude: 2.177475
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   74bae94:
@@ -102,7 +102,7 @@ photos:
     location:
       latitude: 41.384231666667
       longitude: 2.1773233333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6af62a9:
@@ -113,7 +113,7 @@ photos:
     location:
       latitude: 41.38427
       longitude: 2.175105
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a83cc73:
@@ -124,7 +124,7 @@ photos:
     location:
       latitude: 41.384243333333
       longitude: 2.1752583333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ef5f142:
@@ -135,7 +135,7 @@ photos:
     location:
       latitude: 41.382396666667
       longitude: 2.1763433333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0ff38fa:
@@ -146,7 +146,7 @@ photos:
     location:
       latitude: 41.380905
       longitude: 2.1826833333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   876a94a:
@@ -157,7 +157,7 @@ photos:
     location:
       latitude: 41.383548333333
       longitude: 2.1818316666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a0926a5:
@@ -168,7 +168,7 @@ photos:
     location:
       latitude: 41.387393333333
       longitude: 2.1832416666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   93f0866:
@@ -179,7 +179,7 @@ photos:
     location:
       latitude: 41.388328333333
       longitude: 2.1879833333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   58363b4:
@@ -190,7 +190,7 @@ photos:
     location:
       latitude: 41.388023333333
       longitude: 2.1838783333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   fd07ffa:
@@ -201,7 +201,7 @@ photos:
     location:
       latitude: 41.386863333333
       longitude: 2.1846316666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   55072cf:
@@ -212,7 +212,7 @@ photos:
     location:
       latitude: 41.38012
       longitude: 2.1748933333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   31ee6d5:
@@ -223,7 +223,7 @@ photos:
     location:
       latitude: 41.375636666667
       longitude: 2.1776183333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0cb02ca:
@@ -234,7 +234,7 @@ photos:
     location:
       latitude: 41.383705
       longitude: 2.1761966666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dabb533:
@@ -249,7 +249,7 @@ photos:
     location:
       latitude: 41.390965
       longitude: 2.1657783333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   13cef07:
@@ -260,7 +260,7 @@ photos:
     location:
       latitude: 41.386668333333
       longitude: 2.175125
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a4ab746:
@@ -271,7 +271,7 @@ photos:
     location:
       latitude: 41.383465
       longitude: 2.18208
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   b3745f7:
@@ -282,7 +282,7 @@ photos:
     location:
       latitude: 41.383725
       longitude: 2.181225
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   899b168:
@@ -293,7 +293,7 @@ photos:
     location:
       latitude: 41.387875
       longitude: 2.1883033333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   8a21440:
@@ -304,7 +304,7 @@ photos:
     location:
       latitude: 41.38786
       longitude: 2.1883866666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   92c630f:
@@ -315,7 +315,7 @@ photos:
     location:
       latitude: 41.388138333333
       longitude: 2.1874366666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   59b913a:
@@ -326,7 +326,7 @@ photos:
     location:
       latitude: 41.38905
       longitude: 2.1870116666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2946b2a:
@@ -337,7 +337,7 @@ photos:
     location:
       latitude: 41.389316666667
       longitude: 2.18666
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9215619:
@@ -348,7 +348,7 @@ photos:
     location:
       latitude: 41.388793333333
       longitude: 2.1835933333333
-    model: One A0001
+    model: One
     sizes:
       1920x1080: { height: 1080, width: 1920 }
       640w: { height: 361, width: 640 }
@@ -363,7 +363,7 @@ photos:
     location:
       latitude: 41.390743333333
       longitude: 2.1813783333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   b53973e:
@@ -374,7 +374,7 @@ photos:
     location:
       latitude: 41.390681666667
       longitude: 2.1813183333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   3c8b14a:
@@ -385,7 +385,7 @@ photos:
     location:
       latitude: 41.394756666667
       longitude: 2.1757566666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ada4f8d:
@@ -396,7 +396,7 @@ photos:
     location:
       latitude: 41.399075
       longitude: 2.1809116666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6473afe:
@@ -407,7 +407,7 @@ photos:
     location:
       latitude: 41.3862
       longitude: 2.197875
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   fe81da4:
@@ -418,7 +418,7 @@ photos:
     location:
       latitude: 41.376998333333
       longitude: 2.1908966666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e4034d1:
@@ -429,7 +429,7 @@ photos:
     location:
       latitude: 41.377013333333
       longitude: 2.1909133333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0e77d58:
@@ -440,7 +440,7 @@ photos:
     location:
       latitude: 41.368091666667
       longitude: 2.1904033333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   86ee230:
@@ -451,7 +451,7 @@ photos:
     location:
       latitude: 41.368053333333
       longitude: 2.1905716666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c703796:
@@ -462,7 +462,7 @@ photos:
     location:
       latitude: 41.368565
       longitude: 2.1907983333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2fae95d:
@@ -473,7 +473,7 @@ photos:
     location:
       latitude: 41.403968333333
       longitude: 2.1742666666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c36ef02:
@@ -484,7 +484,7 @@ photos:
     location:
       latitude: 41.403171666667
       longitude: 2.1737283333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   aea3e37:
@@ -495,7 +495,7 @@ photos:
     location:
       latitude: 41.403171666667
       longitude: 2.1737283333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   993fd11:
@@ -506,7 +506,7 @@ photos:
     location:
       latitude: 41.402641666667
       longitude: 2.1736566666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   60e86d3:
@@ -517,7 +517,7 @@ photos:
     location:
       latitude: 41.404246666667
       longitude: 2.1748383333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dbd4a70:
@@ -528,7 +528,7 @@ photos:
     location:
       latitude: 41.409656666667
       longitude: 2.1742733333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   27d585b:
@@ -539,7 +539,7 @@ photos:
     location:
       latitude: 41.417186666667
       longitude: 2.1640683333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   beccb64:
@@ -550,7 +550,7 @@ photos:
     location:
       latitude: 41.417221666667
       longitude: 2.1637366666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   8a91e5b:
@@ -561,7 +561,7 @@ photos:
     location:
       latitude: 41.41552
       longitude: 2.154405
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   1005503:
@@ -572,7 +572,7 @@ photos:
     location:
       latitude: 41.394061666667
       longitude: 2.1538633333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7ec7b8e:
@@ -583,7 +583,7 @@ photos:
     location:
       latitude: 41.414836666667
       longitude: 2.1533883333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   75b2f0f:
@@ -591,7 +591,7 @@ photos:
     date: 2015-07-04 16:27:56
     exposure: 1/1150
     file: IMG_20150704_162754
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   770ac89:
@@ -602,7 +602,7 @@ photos:
     location:
       latitude: 41.414543333333
       longitude: 2.1538183333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a379c9e:
@@ -613,7 +613,7 @@ photos:
     location:
       latitude: 41.41372
       longitude: 2.153685
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   66e1ca2:
@@ -624,7 +624,7 @@ photos:
     location:
       latitude: 41.391956666667
       longitude: 2.1651633333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   031f6b0:
@@ -635,7 +635,7 @@ photos:
     location:
       latitude: 41.394763333333
       longitude: 2.1618016666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0376a27:
@@ -646,7 +646,7 @@ photos:
     location:
       latitude: 41.376251666667
       longitude: 2.1479033333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f2209d1:
@@ -657,7 +657,7 @@ photos:
     location:
       latitude: 41.375583333333
       longitude: 2.149325
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   892eb34:
@@ -668,7 +668,7 @@ photos:
     location:
       latitude: 41.372486666667
       longitude: 2.1510066666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   1f6e81e:
@@ -679,6 +679,6 @@ photos:
     location:
       latitude: 41.370871666667
       longitude: 2.1516383333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-spain-portrait.yml b/_data/gallery/2015-spain-portrait.yml
index 7b04f51..b421732 100644
--- a/_data/gallery/2015-spain-portrait.yml
+++ b/_data/gallery/2015-spain-portrait.yml
@@ -1,4 +1,4 @@
-title: Spain - portret
+title: Spain - Portrait
 date: 2015-06-27
 end_date: 2015-07-02
 map:
@@ -15,7 +15,7 @@ photos:
     date: 2015-06-30 15:00:17
     exposure: 1/3200
     file: IMG_20150630_150015
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6904318:
@@ -26,6 +26,6 @@ photos:
     location:
       latitude: 41.236686666667
       longitude: 1.8236266666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-spain-sitges.yml b/_data/gallery/2015-spain-sitges.yml
index 32d1f5f..75fbfd1 100644
--- a/_data/gallery/2015-spain-sitges.yml
+++ b/_data/gallery/2015-spain-sitges.yml
@@ -14,7 +14,7 @@ photos:
     location:
       latitude: 41.228221666667
       longitude: 1.7873166666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   4a7abd3:
@@ -25,7 +25,7 @@ photos:
     location:
       latitude: 41.227851666667
       longitude: 1.785015
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c102420:
@@ -36,7 +36,7 @@ photos:
     location:
       latitude: 41.228893333333
       longitude: 1.7853116666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0381192:
@@ -47,7 +47,7 @@ photos:
     location:
       latitude: 41.228878333333
       longitude: 1.7853233333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0605fba:
@@ -58,7 +58,7 @@ photos:
     location:
       latitude: 41.236695
       longitude: 1.8235283333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   fac0784:
@@ -69,7 +69,7 @@ photos:
     location:
       latitude: 41.237048333333
       longitude: 1.8228266666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   be2277a:
@@ -80,7 +80,7 @@ photos:
     location:
       latitude: 41.237445
       longitude: 1.8231183333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   13215a0:
@@ -91,7 +91,7 @@ photos:
     location:
       latitude: 41.236678333333
       longitude: 1.8210633333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   10b6e2d:
@@ -99,7 +99,7 @@ photos:
     date: 2015-06-30 15:02:31
     exposure: 1/2200
     file: IMG_20150630_150229
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2b745a8:
@@ -110,7 +110,7 @@ photos:
     location:
       latitude: 41.236121666667
       longitude: 1.81792
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c9de3c2:
@@ -121,7 +121,7 @@ photos:
     location:
       latitude: 41.236145
       longitude: 1.81783
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dacd9dc:
@@ -132,7 +132,7 @@ photos:
     location:
       latitude: 41.234585
       longitude: 1.8119
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e945f15:
@@ -143,7 +143,7 @@ photos:
     location:
       latitude: 41.234538333333
       longitude: 1.8117933333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   70ce4fd:
@@ -154,7 +154,7 @@ photos:
     location:
       latitude: 41.234481666667
       longitude: 1.8070983333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   4348930:
@@ -165,7 +165,7 @@ photos:
     location:
       latitude: 41.234153333333
       longitude: 1.806225
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f57bbf7:
@@ -176,7 +176,7 @@ photos:
     location:
       latitude: 41.232265
       longitude: 1.80028
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   cadb90d:
@@ -187,7 +187,7 @@ photos:
     location:
       latitude: 41.224181666667
       longitude: 1.7707433333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   8d246e7:
@@ -198,7 +198,7 @@ photos:
     location:
       latitude: 41.236796666667
       longitude: 1.82372
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   3025085:
@@ -209,7 +209,7 @@ photos:
     location:
       latitude: 41.236511666667
       longitude: 1.82375
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   d05ac75:
@@ -220,6 +220,6 @@ photos:
     location:
       latitude: 41.233771666667
       longitude: 1.80544
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-spain-tarragona.yml b/_data/gallery/2015-spain-tarragona.yml
index e10b72a..f316a59 100644
--- a/_data/gallery/2015-spain-tarragona.yml
+++ b/_data/gallery/2015-spain-tarragona.yml
@@ -13,7 +13,7 @@ photos:
     location:
       latitude: 41.117123333333
       longitude: 1.25617
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   1422b9b:
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 41.113583333333
       longitude: 1.25641
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   5a4c1c4:
@@ -35,7 +35,7 @@ photos:
     location:
       latitude: 41.118206666667
       longitude: 1.2472083333333
-    model: One A0001
+    model: One
     sizes:
       1920x1080: { height: 1080, width: 1920 }
       640w: { height: 1138, width: 640 }
@@ -50,6 +50,6 @@ photos:
     location:
       latitude: 41.11692
       longitude: 1.2556716666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-summer-aberdeen-tolbooth.yml b/_data/gallery/2015-summer-aberdeen-tolbooth.yml
index 7938bf2..010a43c 100644
--- a/_data/gallery/2015-summer-aberdeen-tolbooth.yml
+++ b/_data/gallery/2015-summer-aberdeen-tolbooth.yml
@@ -6,7 +6,7 @@ photos:
     date: 2015-07-18 11:47:30
     exposure: 1/20
     file: IMG_20150718_114727
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   4296a83:
@@ -14,7 +14,7 @@ photos:
     date: 2015-07-18 11:48:07
     exposure: 1/6
     file: IMG_20150718_114804
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 1138, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -25,7 +25,7 @@ photos:
     date: 2015-07-18 11:48:24
     exposure: 1/25
     file: IMG_20150718_114822
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   1222a7a:
@@ -33,7 +33,7 @@ photos:
     date: 2015-07-18 11:59:44
     exposure: 1/20
     file: IMG_20150718_115942
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   39df1f6:
@@ -41,6 +41,6 @@ photos:
     date: 2015-07-18 12:03:21
     exposure: 1/25
     file: IMG_20150718_120318
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-summer-aberdeen.yml b/_data/gallery/2015-summer-aberdeen.yml
index 1f34775..4ed5cec 100644
--- a/_data/gallery/2015-summer-aberdeen.yml
+++ b/_data/gallery/2015-summer-aberdeen.yml
@@ -10,7 +10,7 @@ photos:
     date: 2015-07-18 12:05:04
     exposure: 1/560
     file: IMG_20150718_120502
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6fd482a:
@@ -18,7 +18,7 @@ photos:
     date: 2015-07-18 12:14:26
     exposure: 1/1500
     file: IMG_20150718_121424
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   28f9814:
@@ -30,7 +30,7 @@ photos:
     date: 2015-07-18 13:13:40
     exposure: 1/20
     file: IMG_20150718_131337
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f5435e7:
@@ -42,6 +42,6 @@ photos:
     date: 2015-07-18 14:02:58
     exposure: 1/1800
     file: IMG_20150718_140256
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2015-summer-dunnottar-castle.yml b/_data/gallery/2015-summer-dunnottar-castle.yml
index bc5ef6a..66efaf2 100644
--- a/_data/gallery/2015-summer-dunnottar-castle.yml
+++ b/_data/gallery/2015-summer-dunnottar-castle.yml
@@ -6,7 +6,7 @@ photos:
     date: 2015-07-18 15:09:29
     exposure: 1/2100
     file: IMG_20150718_150927
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7aecc50:
@@ -14,7 +14,7 @@ photos:
     date: 2015-07-18 15:11:17
     exposure: 1/640
     file: IMG_20150718_151114
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a417923:
@@ -22,7 +22,7 @@ photos:
     date: 2015-07-18 15:11:30
     exposure: 1/1500
     file: IMG_20150718_151128
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   44dfad5:
@@ -30,7 +30,7 @@ photos:
     date: 2015-07-18 15:13:48
     exposure: 1/1500
     file: IMG_20150718_151346
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f5e4aa3:
@@ -38,7 +38,7 @@ photos:
     date: 2015-07-18 15:15:11
     exposure: 1/1250
     file: IMG_20150718_151509
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c986282:
@@ -46,7 +46,7 @@ photos:
     date: 2015-07-18 15:15:23
     exposure: 1/1300
     file: IMG_20150718_151521
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   61a3ec9:
@@ -54,7 +54,7 @@ photos:
     date: 2015-07-18 15:15:57
     exposure: 1/1250
     file: IMG_20150718_151556
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   b653064:
@@ -62,7 +62,7 @@ photos:
     date: 2015-07-18 15:16:48
     exposure: 1/250
     file: IMG_20150718_151646
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   ce5f4e7:
@@ -70,7 +70,7 @@ photos:
     date: 2015-07-18 15:31:46
     exposure: 1/1200
     file: IMG_20150718_153144
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   795eed9:
@@ -78,7 +78,7 @@ photos:
     date: 2015-07-18 15:33:29
     exposure: 1/17
     file: IMG_20150718_153327
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   493554a:
@@ -86,7 +86,7 @@ photos:
     date: 2015-07-18 15:34:46
     exposure: 1/17
     file: IMG_20150718_153443
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   cd95b03:
@@ -94,7 +94,7 @@ photos:
     date: 2015-07-18 15:34:55
     exposure: 1/220
     file: IMG_20150718_153453
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 1138, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -105,7 +105,7 @@ photos:
     date: 2015-07-18 15:36:01
     exposure: 1/900
     file: IMG_20150718_153559
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   eb470d1:
@@ -113,7 +113,7 @@ photos:
     date: 2015-07-18 15:36:14
     exposure: 1/1250
     file: IMG_20150718_153612
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   92bafd2:
@@ -121,7 +121,7 @@ photos:
     date: 2015-07-18 15:38:29
     exposure: 1/1500
     file: IMG_20150718_153827
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 1138, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -132,7 +132,7 @@ photos:
     date: 2015-07-18 15:38:51
     exposure: 1/2200
     file: IMG_20150718_153849
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dfe0c24:
@@ -140,7 +140,7 @@ photos:
     date: 2015-07-18 15:41:15
     exposure: 1/1150
     file: IMG_20150718_154114
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 1138, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -151,7 +151,7 @@ photos:
     date: 2015-07-18 15:42:53
     exposure: 1/1100
     file: IMG_20150718_154251
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a70ef2d:
@@ -159,7 +159,7 @@ photos:
     date: 2015-07-18 15:47:02
     exposure: 1/1400
     file: IMG_20150718_154700
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0d68c24:
@@ -167,7 +167,7 @@ photos:
     date: 2015-07-18 16:02:41
     exposure: 1/1900
     file: IMG_20150718_160239
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a52bf7d:
@@ -175,7 +175,7 @@ photos:
     date: 2015-07-18 16:09:17
     exposure: 1/1900
     file: IMG_20150718_160915
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   c507a24:
@@ -183,7 +183,7 @@ photos:
     date: 2015-07-18 16:10:40
     exposure: 1/2100
     file: IMG_20150718_161038
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6e7bcae:
@@ -191,7 +191,7 @@ photos:
     date: 2015-07-18 16:14:16
     exposure: 1/1000
     file: IMG_20150718_161414
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   87a6832:
@@ -199,7 +199,7 @@ photos:
     date: 2015-07-18 16:19:57
     exposure: 1/750
     file: IMG_20150718_161954
-    model: One A0001
+    model: One
     sizes:
       640w: { height: 1138, width: 640 }
       200x200: { height: 200, width: 200 }
@@ -210,7 +210,7 @@ photos:
     date: 2015-07-18 16:32:00
     exposure: 1/800
     file: IMG_20150718_163157
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7955e5f:
@@ -218,7 +218,7 @@ photos:
     date: 2015-07-18 16:33:02
     exposure: 1/900
     file: IMG_20150718_163301
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   b0cedd0:
@@ -226,7 +226,7 @@ photos:
     date: 2015-07-18 16:59:20
     exposure: 1/640
     file: IMG_20150718_165918
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   514b8d5:
diff --git a/_data/gallery/2015-summer-holidays.yml b/_data/gallery/2015-summer-holidays.yml
index 02ba576..30e1a7e 100644
--- a/_data/gallery/2015-summer-holidays.yml
+++ b/_data/gallery/2015-summer-holidays.yml
@@ -6,142 +6,94 @@ photos:
     aperture: f/4.6
     date: 2015-08-01 18:55:48
     exposure: 1/500
-    file: SAM_7562.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7562
+    model: WB600
+    make: Samsung
   5c66765:
     aperture: f/6.5
     date: 2015-08-01 20:37:04
     exposure: 1/250
-    file: SAM_7583.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7583
+    model: WB600
+    make: Samsung
   381002b:
     aperture: f/6.2
     date: 2015-08-02 09:23:01
     exposure: 1/500
-    file: SAM_7589.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7589
+    model: WB600
+    make: Samsung
   02207bd:
     aperture: f/4.8
     date: 2015-08-02 18:10:43
     exposure: 1/750
-    file: SAM_7590.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7590
+    model: WB600
+    make: Samsung
   ce3abd3:
     aperture: f/10.0
     date: 2015-08-03 20:21:58
     exposure: 1/25
     file: Panorama-klein
-    model: NIKON D3100
+    model: D3100
     sizes:
       640w: { height: 141, width: 640 }
       200x200: { height: 200, width: 200 }
       96x96: { height: 96, width: 96 }
-    make: NIKON CORPORATION
+    make: Nikon
   87055e2:
     aperture: f/5.0
     date: 2015-08-07 17:50:45
     exposure: 1/750
-    file: SAM_7605.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7605
+    model: WB600
+    make: Samsung
   612b54f:
     aperture: f/6.2
     date: 2015-08-07 17:52:03
     exposure: 1/350
-    file: SAM_7608.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7608
+    model: WB600
+    make: Samsung
   3ed240c:
     aperture: f/8.3
     date: 2015-08-08 14:33:11
     exposure: 1/250
-    file: SAM_7611.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7611
+    model: WB600
+    make: Samsung
   6032ca4:
     aperture: f/4.8
     date: 2015-08-08 15:54:08
     exposure: 1/750
-    file: SAM_7616.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7616
+    model: WB600
+    make: Samsung
   16ac82b:
     aperture: f/6.6
     date: 2015-08-08 15:56:58
     exposure: 1/750
-    file: SAM_7621.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7621
+    model: WB600
+    make: Samsung
   eb1c684:
     aperture: f/5.2
     date: 2015-08-08 16:33:37
     exposure: 1/750
-    file: SAM_7623.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7623
+    model: WB600
+    make: Samsung
   20037b3:
     aperture: f/7.0
     date: 2015-08-08 16:40:38
     exposure: 1/350
-    file: SAM_7634.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_7634
+    model: WB600
+    make: Samsung
   491fa55:
     aperture: f/3.4
     date: 2015-08-08 21:43:10
     exposure: 1/30
-    file: SAM_7653.JPG
-    model: SAMSUNG WB600 / VLUU WB600 / SAMSUNG WB610
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_7653
+    model: WB600
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2015-visit-sanne-fife-anstruther.yml b/_data/gallery/2015-visit-sanne-fife-anstruther.yml
index 7f218e5..a54ba18 100644
--- a/_data/gallery/2015-visit-sanne-fife-anstruther.yml
+++ b/_data/gallery/2015-visit-sanne-fife-anstruther.yml
@@ -6,7 +6,7 @@ photos:
     date: 2015-08-23 13:18:44
     exposure: 1/950
     file: IMG_20150823_131841
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f659d36:
@@ -14,7 +14,7 @@ photos:
     date: 2015-08-23 13:47:24
     exposure: 1/2200
     file: IMG_20150823_134722
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   315c401:
@@ -22,7 +22,7 @@ photos:
     date: 2015-08-23 13:52:39
     exposure: 1/1600
     file: IMG_20150823_135237
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   74b5a76:
@@ -30,26 +30,22 @@ photos:
     date: 2015-08-23 13:55:08
     exposure: 1/1600
     file: IMG_20150823_135506
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   14a875b:
     aperture: f/9.2
     date: 2015-08-23 14:42:53
     exposure: 1/250
-    file: SAM_0750.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 854, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_0750
+    model: PL211
+    make: Samsung
   bf429fe:
     aperture: f/2.0
     date: 2015-08-23 14:46:13
     exposure: 1/1600
     file: IMG_20150823_144611
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9ee6652:
@@ -57,7 +53,7 @@ photos:
     date: 2015-08-23 14:48:14
     exposure: 1/1700
     file: IMG_20150823_144812
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7b54f72:
@@ -69,39 +65,27 @@ photos:
     date: 2015-08-23 14:51:12
     exposure: 1/3600
     file: IMG_20150823_145110
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9e38769:
     aperture: f/3.3
     date: 2015-08-23 15:05:32
     exposure: 1/45
-    file: SAM_0752.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_0752
+    model: PL211
+    make: Samsung
   941f7f8:
     aperture: f/3.3
     date: 2015-08-23 15:20:45
     exposure: 1/500
-    file: SAM_0756.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_0756
+    model: PL211
+    make: Samsung
   d24e161:
     aperture: f/3.3
     date: 2015-08-23 16:14:01
     exposure: 1/750
-    file: SAM_0763.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_0763
+    model: PL211
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2015-visit-sanne-fife-pittenweem.yml b/_data/gallery/2015-visit-sanne-fife-pittenweem.yml
index 3eb3e03..bbf4e8b 100644
--- a/_data/gallery/2015-visit-sanne-fife-pittenweem.yml
+++ b/_data/gallery/2015-visit-sanne-fife-pittenweem.yml
@@ -6,7 +6,7 @@ photos:
     date: 2015-08-23 11:49:16
     exposure: 1/2100
     file: IMG_20150823_114915
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   03292ba:
@@ -14,7 +14,7 @@ photos:
     date: 2015-08-23 11:51:38
     exposure: 1/1400
     file: IMG_20150823_115136
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dbe3d72:
@@ -22,7 +22,7 @@ photos:
     date: 2015-08-23 11:53:04
     exposure: 1/1700
     file: IMG_20150823_115302
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a3562f0:
@@ -30,7 +30,7 @@ photos:
     date: 2015-08-23 11:56:46
     exposure: 1/1600
     file: IMG_20150823_115644
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   a42e5b0:
@@ -38,7 +38,7 @@ photos:
     date: 2015-08-23 11:59:18
     exposure: 1/1500
     file: IMG_20150823_115916
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   621f0cb:
@@ -46,7 +46,7 @@ photos:
     date: 2015-08-23 12:00:23
     exposure: 1/1800
     file: IMG_20150823_120021
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   45a813c:
@@ -54,7 +54,7 @@ photos:
     date: 2015-08-23 12:03:18
     exposure: 1/3200
     file: IMG_20150823_120316
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   7365055:
@@ -62,7 +62,7 @@ photos:
     date: 2015-08-23 12:06:12
     exposure: 1/1400
     file: IMG_20150823_120610
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   522e4c2:
@@ -70,7 +70,7 @@ photos:
     date: 2015-08-23 12:13:01
     exposure: 1/2000
     file: IMG_20150823_121259
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   fecb909:
@@ -81,29 +81,21 @@ photos:
     aperture: f/3.3
     date: 2015-08-23 12:52:44
     exposure: 1/1000
-    file: SAM_0731.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_0731
+    model: PL211
+    make: Samsung
   6613d83:
     aperture: f/2.0
     date: 2015-08-23 12:56:36
     exposure: 1/1500
     file: IMG_20150823_125634
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   95c47af:
     aperture: f/9.2
     date: 2015-08-23 12:59:51
     exposure: 1/180
-    file: SAM_0735.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_0735
+    model: PL211
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2015-visit-sanne-highlands-distillery.yml b/_data/gallery/2015-visit-sanne-highlands-distillery.yml
index ff4582d..a5b9564 100644
--- a/_data/gallery/2015-visit-sanne-highlands-distillery.yml
+++ b/_data/gallery/2015-visit-sanne-highlands-distillery.yml
@@ -10,7 +10,7 @@ photos:
     date: 2015-08-22 17:09:03
     exposure: 1/430
     file: IMG_20150822_170901
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   2283a5c:
@@ -18,17 +18,13 @@ photos:
     date: 2015-08-22 17:09:13
     exposure: 1/550
     file: IMG_20150822_170911
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   1bdf71a:
     aperture: f/4.0
     date: 2015-08-22 18:09:40
     exposure: 1/250
-    file: SAM_0725.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_0725
+    model: PL211
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2015-visit-sanne-highlands-hike.yml b/_data/gallery/2015-visit-sanne-highlands-hike.yml
index 33223c0..f5a9511 100644
--- a/_data/gallery/2015-visit-sanne-highlands-hike.yml
+++ b/_data/gallery/2015-visit-sanne-highlands-hike.yml
@@ -1,4 +1,4 @@
-title: Visit Sanne - highland hike
+title: Visit Sanne - Highland Hike
 date: 2015-08-22
 photos:
   7b382b1:
@@ -14,7 +14,7 @@ photos:
     date: 2015-08-22 13:28:55
     exposure: 1/160
     file: IMG_20150822_132852
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9a24cc7:
@@ -22,7 +22,7 @@ photos:
     date: 2015-08-22 13:39:33
     exposure: 1/400
     file: IMG_20150822_133932
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   dbc55f0:
@@ -30,7 +30,7 @@ photos:
     date: 2015-08-22 14:02:37
     exposure: 1/120
     file: IMG_20150822_140236
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   886bcc9:
@@ -42,7 +42,7 @@ photos:
     date: 2015-08-22 14:04:52
     exposure: 1/100
     file: IMG_20150822_140450
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   9b8f8ff:
@@ -50,7 +50,7 @@ photos:
     date: 2015-08-22 14:06:34
     exposure: 1/100
     file: IMG_20150822_140631
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0f184f6:
@@ -58,7 +58,7 @@ photos:
     date: 2015-08-22 14:06:54
     exposure: 1/140
     file: IMG_20150822_140652
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   6561ee9:
@@ -66,7 +66,7 @@ photos:
     date: 2015-08-22 14:14:30
     exposure: 1/350
     file: IMG_20150822_141428
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f3d85ec:
@@ -78,7 +78,7 @@ photos:
     date: 2015-08-22 14:32:34
     exposure: 1/100
     file: IMG_20150822_143232
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   3bcccef:
@@ -86,7 +86,7 @@ photos:
     date: 2015-08-22 14:34:08
     exposure: 1/900
     file: IMG_20150822_143406
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   5a165c6:
@@ -94,7 +94,7 @@ photos:
     date: 2015-08-22 14:36:06
     exposure: 1/280
     file: IMG_20150822_143604
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   62dd57c:
@@ -102,39 +102,27 @@ photos:
     date: 2015-08-22 14:51:33
     exposure: 1/220
     file: IMG_20150822_145131
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f04f202:
     aperture: f/3.3
     date: 2015-08-22 15:35:06
     exposure: 1/180
-    file: SAM_0705.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_0705
+    model: PL211
+    make: Samsung
   d657fbe:
     aperture: f/3.3
     date: 2015-08-22 15:45:35
     exposure: 1/180
-    file: SAM_0707.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_0707
+    model: PL211
+    make: Samsung
   2ae039c:
     aperture: f/4.3
     date: 2015-08-22 15:53:19
     exposure: 1/90
-    file: SAM_0712.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_0712
+    model: PL211
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2015-visit-sanne-highlands-perth.yml b/_data/gallery/2015-visit-sanne-highlands-perth.yml
index 9b3d638..6424d3f 100644
--- a/_data/gallery/2015-visit-sanne-highlands-perth.yml
+++ b/_data/gallery/2015-visit-sanne-highlands-perth.yml
@@ -1,4 +1,4 @@
-title: visit-sanne-2015-highlands-perth
+title: Visit Sanne - Highlands & Perth
 date: 2015-08-22
 photos:
   b4aeee4:
@@ -6,7 +6,7 @@ photos:
     date: 2015-08-22 18:24:14
     exposure: 1/50
     file: IMG_20150822_182412
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   febc436:
@@ -14,7 +14,7 @@ photos:
     date: 2015-08-22 18:44:28
     exposure: 1/120
     file: IMG_20150822_184426
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   38a287f:
@@ -22,7 +22,7 @@ photos:
     date: 2015-08-22 18:46:38
     exposure: 1/125
     file: IMG_20150822_184636
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   770159b:
@@ -30,17 +30,13 @@ photos:
     date: 2015-08-22 18:47:29
     exposure: 1/60
     file: IMG_20150822_184727
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   3851fc2:
     aperture: f/3.7
     date: 2015-08-22 19:49:17
     exposure: 1/60
-    file: SAM_0730.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
\ No newline at end of file
+    file: SAM_0730
+    model: PL211
+    make: Samsung
\ No newline at end of file
diff --git a/_data/gallery/2015-visit-sanne.yml b/_data/gallery/2015-visit-sanne.yml
index 490a990..cf36b8b 100644
--- a/_data/gallery/2015-visit-sanne.yml
+++ b/_data/gallery/2015-visit-sanne.yml
@@ -6,38 +6,30 @@ photos:
     aperture: f/3.3
     date: 2015-08-21 13:16:22
     exposure: 1/45
-    file: SAM_0688.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_0688
+    model: PL211
+    make: Samsung
   1016c64:
     aperture: f/2.0
     date: 2015-08-22 15:11:37
     exposure: 1/290
     file: IMG_20150822_151135
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   0b7862b:
     aperture: f/3.3
     date: 2015-08-22 16:47:47
     exposure: 1/180
-    file: SAM_0716.JPG
-    model: SAMSUNG PL210, PL211 / VLUU PL210, PL211
-    sizes:
-      640w: { height: 480, width: 640 }
-      200x200: { height: 200, width: 200 }
-      96x96: { height: 96, width: 96 }
-    make: SAMSUNG
+    file: SAM_0716
+    model: PL211
+    make: Samsung
   1cc8ac2:
     aperture: f/2.0
     date: 2015-08-23 15:49:23
     exposure: 1/2300
     file: IMG_20150823_154921
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   23135f6:
diff --git a/_data/gallery/2016-conic-hill.yml b/_data/gallery/2016-conic-hill.yml
index 4907713..eeaa214 100644
--- a/_data/gallery/2016-conic-hill.yml
+++ b/_data/gallery/2016-conic-hill.yml
@@ -15,7 +15,7 @@ photos:
     latitude: 56.097073333333
     longitude: -4.5269983333333
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   d1a75ca:
     altitude: 375
@@ -27,7 +27,7 @@ photos:
     latitude: 56.097053333333
     longitude: -4.5270266666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   31f90ad:
     altitude: 372
@@ -39,7 +39,7 @@ photos:
     latitude: 56.097026666667
     longitude: -4.527035
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   6045d08:
     altitude: 373
@@ -51,7 +51,7 @@ photos:
     latitude: 56.097008333333
     longitude: -4.5270433333333
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   3cd78a5:
     altitude: 371
@@ -63,7 +63,7 @@ photos:
     latitude: 56.09718
     longitude: -4.52691
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   bf88ec6:
     altitude: 374
@@ -75,7 +75,7 @@ photos:
     latitude: 56.097301666667
     longitude: -4.526525
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   c57134f:
     altitude: 375
@@ -87,7 +87,7 @@ photos:
     latitude: 56.097236666667
     longitude: -4.5265366666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   dd427df:
     altitude: 373
@@ -99,7 +99,7 @@ photos:
     latitude: 56.097053333333
     longitude: -4.5269433333333
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   8ac269a:
     altitude: 395
@@ -111,7 +111,7 @@ photos:
     latitude: 56.096881666667
     longitude: -4.525275
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   8b0745b:
     aperture: f/2.0
@@ -119,7 +119,7 @@ photos:
     exposure: 1/160
     file: IMG_20160206_131232
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   aacf784:
     aperture: f/2.0
@@ -127,7 +127,7 @@ photos:
     exposure: 1/125
     file: IMG_20160206_131240
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   d237230:
     altitude: 408
@@ -139,7 +139,7 @@ photos:
     latitude: 56.097076666667
     longitude: -4.5249483333333
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   9c53315:
     altitude: 408
@@ -151,7 +151,7 @@ photos:
     latitude: 56.097038333333
     longitude: -4.52492
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   d8604e0:
     altitude: 414
@@ -163,7 +163,7 @@ photos:
     latitude: 56.097068333333
     longitude: -4.5249416666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   035b889:
     altitude: 401
@@ -175,7 +175,7 @@ photos:
     latitude: 56.097008333333
     longitude: -4.5247216666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   56068c9:
     altitude: 392
@@ -187,7 +187,7 @@ photos:
     latitude: 56.096215
     longitude: -4.5272316666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   2805040:
     altitude: 392
@@ -199,7 +199,7 @@ photos:
     latitude: 56.096191666667
     longitude: -4.52728
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   c4f6c8e:
     altitude: 392
@@ -211,7 +211,7 @@ photos:
     latitude: 56.096191666667
     longitude: -4.5272766666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   599bc14:
     altitude: 392
@@ -223,7 +223,7 @@ photos:
     latitude: 56.096191666667
     longitude: -4.5272833333333
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   fd20366:
     altitude: 398
@@ -235,7 +235,7 @@ photos:
     latitude: 56.096295
     longitude: -4.52733
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   30971db:
     altitude: 371
@@ -247,7 +247,7 @@ photos:
     latitude: 56.096751666667
     longitude: -4.527935
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   738e82f:
     altitude: 321
@@ -259,7 +259,7 @@ photos:
     latitude: 56.095458333333
     longitude: -4.5303233333333
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   72dbe4a:
     altitude: 252
@@ -271,7 +271,7 @@ photos:
     latitude: 56.093795
     longitude: -4.534595
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   46d7722:
     altitude: 251
@@ -283,7 +283,7 @@ photos:
     latitude: 56.093815
     longitude: -4.5346866666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   fca2d8c:
     altitude: 252
@@ -295,7 +295,7 @@ photos:
     latitude: 56.09378
     longitude: -4.534695
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   1a1a468:
     altitude: 250
@@ -307,7 +307,7 @@ photos:
     latitude: 56.093776666667
     longitude: -4.5345566666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   8d4d1e7:
     altitude: 207
@@ -319,7 +319,7 @@ photos:
     latitude: 56.092358333333
     longitude: -4.536475
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   4bad3d7:
     altitude: 209
@@ -331,7 +331,7 @@ photos:
     latitude: 56.091998333333
     longitude: -4.5352666666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   e589a86:
     aperture: f/2.0
@@ -339,7 +339,7 @@ photos:
     exposure: 1/17
     file: IMG_20160206_134510
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   de5e11c:
     altitude: 135
@@ -351,7 +351,7 @@ photos:
     latitude: 56.090015
     longitude: -4.533065
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   1b8a3ae:
     altitude: 87
@@ -363,7 +363,7 @@ photos:
     latitude: 56.084285
     longitude: -4.5404733333333
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   e3b7316:
     altitude: 47
@@ -375,7 +375,7 @@ photos:
     latitude: 56.083598333333
     longitude: -4.542085
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   cd964b6:
     altitude: 60
@@ -387,7 +387,7 @@ photos:
     latitude: 56.087616666667
     longitude: -4.5476116666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   93550e4:
     altitude: 71
@@ -399,7 +399,7 @@ photos:
     latitude: 56.08768
     longitude: -4.547695
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   b01f392:
     altitude: 77
@@ -411,7 +411,7 @@ photos:
     latitude: 56.088875
     longitude: -4.5483766666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   226b3a8:
     altitude: 52
@@ -423,7 +423,7 @@ photos:
     latitude: 56.095265
     longitude: -4.556085
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   d15a489:
     altitude: 83
@@ -435,7 +435,7 @@ photos:
     latitude: 56.08511
     longitude: -4.5465333333333
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   9a4fd13:
     altitude: 100
@@ -447,5 +447,5 @@ photos:
     latitude: 56.084858333333
     longitude: -4.5466166666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
diff --git a/_data/gallery/2016-peugeot-206-leak.yml b/_data/gallery/2016-peugeot-206-leak.yml
index f63b8bb..71ee7e5 100644
--- a/_data/gallery/2016-peugeot-206-leak.yml
+++ b/_data/gallery/2016-peugeot-206-leak.yml
@@ -1,4 +1,4 @@
-title: Peugeot 206 Oil Leak
+title: Peugeot 206 - Oil Leak
 date: 2016-01-09
 ignore: true
 photos:
@@ -7,7 +7,7 @@ photos:
     date: 2016-01-09 13:23:19
     exposure: 1/25
     file: IMG_20160109_132317
-    model: One A0001
+    model: One
     width: 1920
     title: Peugeot In Olie
     make: OnePlus
diff --git a/_data/gallery/2016-rainbow-views.yml b/_data/gallery/2016-rainbow-views.yml
index c6d55a6..00025f5 100644
--- a/_data/gallery/2016-rainbow-views.yml
+++ b/_data/gallery/2016-rainbow-views.yml
@@ -16,7 +16,7 @@ photos:
     latitude: 56.340843194444
     longitude: -2.8112706944444
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   3263441:
     altitude: 77
@@ -28,7 +28,7 @@ photos:
     latitude: 56.340705861095
     longitude: -2.811337
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   1803d4b:
     date: 2016-01-29 13:23:26
diff --git a/_data/gallery/2016-seat-ibiza-scrap.yml b/_data/gallery/2016-seat-ibiza-scrap.yml
index 172d076..da7ed4f 100644
--- a/_data/gallery/2016-seat-ibiza-scrap.yml
+++ b/_data/gallery/2016-seat-ibiza-scrap.yml
@@ -13,7 +13,7 @@ photos:
     location:
       latitude: 56.330436666667
       longitude: -2.80995
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   eea3ae1:
@@ -24,7 +24,7 @@ photos:
     location:
       latitude: 56.330375
       longitude: -2.809805
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   e5811cb:
@@ -35,7 +35,7 @@ photos:
     location:
       latitude: 56.330395
       longitude: -2.80973
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   924e739:
@@ -46,7 +46,7 @@ photos:
     location:
       latitude: 56.33041
       longitude: -2.8097866666667
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
   f3b37f7:
@@ -57,6 +57,6 @@ photos:
     location:
       latitude: 56.33046
       longitude: -2.8097483333333
-    model: One A0001
+    model: One
     width: 1920
     make: OnePlus
\ No newline at end of file
diff --git a/_data/gallery/2016-snow-run.yml b/_data/gallery/2016-snow-run.yml
index 7beb349..2a29841 100644
--- a/_data/gallery/2016-snow-run.yml
+++ b/_data/gallery/2016-snow-run.yml
@@ -15,7 +15,7 @@ photos:
     latitude: 56.33037566678
     longitude: -2.8100201666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   d7aec3f:
     altitude: 77
@@ -27,7 +27,7 @@ photos:
     latitude: 56.330451944444
     longitude: -2.8096883055216
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   0f7f25a:
     altitude: 112
@@ -39,7 +39,7 @@ photos:
     latitude: 56.326015472243
     longitude: -2.8037125833269
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   1055ae9:
     altitude: 109
@@ -51,7 +51,7 @@ photos:
     latitude: 56.325984944421
     longitude: -2.8036386944687
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   958c6e2:
     altitude: 133
@@ -63,7 +63,7 @@ photos:
     latitude: 56.322174055581
     longitude: -2.8001851944444
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   56854c4:
     altitude: 138
@@ -75,7 +75,7 @@ photos:
     latitude: 56.322254166667
     longitude: -2.8002026111111
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   91b9ca9:
     altitude: 127
@@ -87,7 +87,7 @@ photos:
     latitude: 56.322231277733
     longitude: -2.8001985277778
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   5d08129:
     altitude: 136
@@ -99,7 +99,7 @@ photos:
     latitude: 56.321250888889
     longitude: -2.8004636666667
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920
   61b6456:
     altitude: 94
@@ -111,5 +111,5 @@ photos:
     latitude: 56.33055875
     longitude: -2.8100535555556
     make: OnePlus
-    model: One A0001
+    model: One
     width: 1920