10 files changed, 16 insertions, 27 deletions
diff --git a/content/stream/2022-07-25.md b/content/stream/2022-07-25.md
index e0dbab6..6fbf364 100644
--- a/content/stream/2022-07-25.md
+++ b/content/stream/2022-07-25.md
@@ -18,4 +18,4 @@ Added an [email address](mailto:y@yulqen.org) to the [About](../about) page, jus
 
 Boris thinks it is his right to enter our house to eat Bob's food. Boris lives with a tortoisehell cat called Maggie who often visits. She is similarly entitled.
 
-{{< figure src="img/bob_boris_web.jpg" title="Bob and Boris">}}
+{{< streamimage filename="bob_boris_web.jpg">}}
diff --git a/content/stream/2022-08-02/index.md b/content/stream/2022-08-02.md
index 0fe7e2f..2985882 100644
--- a/content/stream/2022-08-02/index.md
+++ b/content/stream/2022-08-02.md
@@ -7,5 +7,4 @@ tags: ['photos']
 
 Barrow-in-Furness in August.
 
-![Barrow-in-Furness in the rain](barrow_tesco_extra.jpg)
-
+{{< streamimage filename="barrow_tesco_extra.jpg" >}}
diff --git a/content/stream/2022_08_04.md b/content/stream/2022_08_04.md
index f94b4bf..0016b25 100644
--- a/content/stream/2022_08_04.md
+++ b/content/stream/2022_08_04.md
@@ -11,4 +11,4 @@ We ate lunch at [The Barn at Beal](http://barnatbeal.com/).
 
 Got home to find a bat in the sink, as detailed in the [cat kill log](../../blog/cats/cat_kills).
 
-{{< figure src="img/holy_island_pyramid.jpg" alt="Holy Island Pyramid" title="Holy Island pyramid thing" >}}
+{{< streamimage filename="holy_island_pyramid.jpg">}}
diff --git a/content/stream/2022_08_11.md b/content/stream/2022_08_11.md
index f00f1b2..30e55a5 100644
--- a/content/stream/2022_08_11.md
+++ b/content/stream/2022_08_11.md
@@ -10,4 +10,4 @@ Leaving Shetland today.
 This is the coastline at the northwestern corner of the Shetland mainland at Eshaness. Couldn't stay long as the children were scared of the cliffs!
 
 
-{{< figure src="img/shetland_coast.jpg" alt="Shetland coastline at Eshaness" title="Shetland coastline at Eashaness" >}}
+{{< streamimage filename="shetland_coast.jpg">}}
diff --git a/content/stream/2022_08_14.md b/content/stream/2022_08_14.md
index 3db85e5..fa83355 100644
--- a/content/stream/2022_08_14.md
+++ b/content/stream/2022_08_14.md
@@ -5,7 +5,6 @@ draft: false
 tags: ['berwick-upon-tweed', 'music']
 ---
 
-<!-- {{< figure src="../../img/swimmer_medal_border.png" alt="Grinning swimmer holding medal" >}} -->
 {{< streamimage filename="swimmer_medal_border.png" >}}
 
 I've had enough of BBC coverage of the European Championships (and latterly the Commonwealth Games). Too much positivity for my liking, it wears you down eventually.
@@ -20,6 +19,6 @@ Listening to: [Carbon Based Lifeforms](https://en.wikipedia.org/wiki/Carbon_Base
 ---
 Went to Tesco today and filled a barrow two-thirds.
 
-{{< figure src="img/trolleys_blur.jpg" alt="Tesco barrows" >}}
+{{< streamimage filename="trolleys_blur.jpg" >}}
 
 Exciting things happening parallel to the mundane, just not reportable.
diff --git a/content/stream/2023-10-21.md b/content/stream/2023-10-21.md
index 8da0d97..bb77a0a 100644
--- a/content/stream/2023-10-21.md
+++ b/content/stream/2023-10-21.md
@@ -7,9 +7,6 @@ tags: ["golf", "quicknotes", "cats"]
 
 A [ginger cat](../blog/cats/cat_kills/#the-perpetrators) beneath a stool, sheltering from the rain:
 
-
-{{< figure src="img/cat_stool.jpg" >}}
-
 {{< streamimage filename="cat_stool.jpg" >}}
 
 ---
diff --git a/content/stream/2023_10_07.md b/content/stream/2023_10_07.md
index 726bc6c..2b53f49 100644
--- a/content/stream/2023_10_07.md
+++ b/content/stream/2023_10_07.md
@@ -9,7 +9,7 @@ Absolutely pissing with rain here in Berwick since about 7pm last night, and for
 
 This is how it looks to Open AI - considerably brighter than reality but quite a nice little scene:
 
-{{<figure src="img/berwick-upon-tweed--northumberland--united-kingdom--october-7-at-9-17-am--light-rain.jpg" >}}
+{{< streamimage filename="berwick-upon-tweed--northumberland--united-kingdom--october-7-at-9-17-am--light-rain.jpg" >}}
 
 ---
 
@@ -24,5 +24,5 @@ Updated the [Programming](../about/programming) page with an update on my latest
 Scotland are playing Ireland in the World Cup tonight.
 Barely able to contain the dread.
 
-{{<figure src="img/stomping_war_propoganda.png" height=600px >}}
+{{< streamimage filename="stomping_war_propoganda.png" size="400" >}}
 
diff --git a/content/stream/2022-08-02/barrow_tesco_extra.jpg b/content/stream/img/barrow_tesco_extra.jpg
index 29e6d8c..29e6d8c 100644
--- a/content/stream/2022-08-02/barrow_tesco_extra.jpg
+++ b/content/stream/img/barrow_tesco_extra.jpg
diff --git a/layouts/shortcodes/streamimage.html b/layouts/shortcodes/streamimage.html
index 2ff9f0a..003b982 100644
--- a/layouts/shortcodes/streamimage.html
+++ b/layouts/shortcodes/streamimage.html
@@ -1,5 +1,3 @@
 {{ $filename := .Get "filename" }}
-
-<!-- <p>{{ $.Page.Params.draft }}</p> -->
-<p>{{ .Scratch.Get "toss" }}</p>
-<img src="../../img/{{ $filename }}">
+{{ $size := .Get "size" }}
+<img src="{{ absURL "/stream/img/" }}{{ $filename }}" height="{{ $size }}">
diff --git a/layouts/stream/list.html b/layouts/stream/list.html
index 2fb46b4..7f3a92f 100644
--- a/layouts/stream/list.html
+++ b/layouts/stream/list.html
@@ -12,21 +12,17 @@
 <h3 id="{{ .Date.Format "Monday, 2 January 2006"| urlize}}">{{ .Date.Format "Monday, 2 January 2006" }}</h3>
 
 
-{{ $.Scratch.Set "toss" "toss" }}
 <div style="margin-bottom: 1em;">
     {{ .Content }}
 </div>
 
-{{ $.Scratch }}
-
-{{ if $paginator.HasPrev }}
-    <p>this page is paginated</p>
-    {{ $.Page.Scratch.Add "imgpath" "PAGINATED" }}
-{{ else }}
-    <p>this page is NOT paginated</p>
-    {{ $.Page.Scratch.Set "imgpath" "img/" }}
-{{ end }}
-
+<!-- {{ if $paginator.HasPrev }} -->
+<!--     <p>this page is paginated</p> -->
+<!--     {{ $.Page.Scratch.Add "imgpath" "PAGINATED" }} -->
+<!-- {{ else }} -->
+<!--     <p>this page is NOT paginated</p> -->
+<!--     {{ $.Page.Scratch.Set "imgpath" "img/" }} -->
+<!-- {{ end }} -->
 
 
 {{ if .Params.tags }}