diff --git a/layouts/shortcodes/paige/code.html b/layouts/shortcodes/paige/code.html
index 17940e2a..c41095e6 100644
--- a/layouts/shortcodes/paige/code.html
+++ b/layouts/shortcodes/paige/code.html
@@ -4,10 +4,9 @@
 {{ $class := .Get "class" }}
 {{ $contentclass := .Get "contentclass" | default "mb-2" }}
 {{ $contentstyle := .Get "contentstyle" }}
-{{ $style := .Get "style" }}
-
 {{ $lang := .Get 0 | default (.Get "lang") | default "plaintext" }}
 {{ $options := .Get "options" }}
+{{ $style := .Get "style" }}
 
 {{ if $caption }}
     {{ $contentclass = $contentclass | default "mb-2" }}
diff --git a/layouts/shortcodes/paige/image.html b/layouts/shortcodes/paige/image.html
index 2a9932ff..3dcbab9f 100644
--- a/layouts/shortcodes/paige/image.html
+++ b/layouts/shortcodes/paige/image.html
@@ -1,23 +1,21 @@
+{{ $alt := .Get "alt" }}
 {{ $caption := .Get "caption" }}
 {{ $captionclass := .Get "captionclass" }}
 {{ $captionstyle := .Get "captionstyle" }}
 {{ $class := .Get "class" }}
 {{ $contentclass := .Get "contentclass" }}
 {{ $contentstyle := .Get "contentstyle" }}
-{{ $style := .Get "style" }}
-
-{{ $alt := .Get "alt" }}
 {{ $height := .Get "height" }}
 {{ $imageclass := .Get "imageclass" }}
 {{ $imagestyle := .Get "imagestyle" }}
+{{ $link := .Get "link" }}
 {{ $method := .Get "method" }}
 {{ $options := .Get "options" }}
 {{ $src := .Get 0 | default (.Get "src") }}
+{{ $style := .Get "style" }}
 {{ $title := .Get "title" }}
 {{ $width := .Get "width" }}
 
-{{ $link := .Get "link" }}
-
 {{ partial "paige/image-figure.html" (dict
     "caption" $caption
     "captionclass" $captionclass