diff --git a/themes/platters/layouts/partials/nethack/log.html b/layouts/partials/nethack/log.html
similarity index 100%
rename from themes/platters/layouts/partials/nethack/log.html
rename to layouts/partials/nethack/log.html
diff --git a/themes/platters/layouts/partials/nethack/logentry.html b/layouts/partials/nethack/logentry.html
similarity index 100%
rename from themes/platters/layouts/partials/nethack/logentry.html
rename to layouts/partials/nethack/logentry.html
diff --git a/themes/platters/layouts/partials/photo_exif_table.html b/layouts/partials/photo_exif_table.html
similarity index 100%
rename from themes/platters/layouts/partials/photo_exif_table.html
rename to layouts/partials/photo_exif_table.html
diff --git a/themes/platters/layouts/partials/photos/list.html b/layouts/partials/photos/list.html
similarity index 100%
rename from themes/platters/layouts/partials/photos/list.html
rename to layouts/partials/photos/list.html
diff --git a/themes/platters/layouts/partials/photos/thumbnail.html b/layouts/partials/photos/thumbnail.html
similarity index 93%
rename from themes/platters/layouts/partials/photos/thumbnail.html
rename to layouts/partials/photos/thumbnail.html
index 831c669..00deb43 100644
--- a/themes/platters/layouts/partials/photos/thumbnail.html
+++ b/layouts/partials/photos/thumbnail.html
@@ -22,7 +22,7 @@
   {{- errorf "No thumbnail available for %s" .Page.Permalink }}
 {{- end -}}
 
-{{ $orientation := partial "images/orientation_angle.html" $thumbnailResource }}
+{{ $orientation := partial "image-utilities/orientation-angle.html" $thumbnailResource }}
 
 {{ $targetWidth := 0 }}
 {{ with .Width }}
diff --git a/themes/platters/layouts/shortcodes/abbr.html b/layouts/shortcodes/abbr.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/abbr.html
rename to layouts/shortcodes/abbr.html
diff --git a/themes/platters/layouts/shortcodes/anagram.html b/layouts/shortcodes/anagram.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/anagram.html
rename to layouts/shortcodes/anagram.html
diff --git a/themes/platters/layouts/shortcodes/audio.html b/layouts/shortcodes/audio.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/audio.html
rename to layouts/shortcodes/audio.html
diff --git a/themes/platters/layouts/shortcodes/collapse.html b/layouts/shortcodes/collapse.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/collapse.html
rename to layouts/shortcodes/collapse.html
diff --git a/themes/platters/layouts/shortcodes/figures/code.html b/layouts/shortcodes/figures/code.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/figures/code.html
rename to layouts/shortcodes/figures/code.html
diff --git a/themes/platters/layouts/shortcodes/figures/image.html b/layouts/shortcodes/figures/image.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/figures/image.html
rename to layouts/shortcodes/figures/image.html
diff --git a/themes/platters/layouts/shortcodes/figures/p5.html b/layouts/shortcodes/figures/p5.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/figures/p5.html
rename to layouts/shortcodes/figures/p5.html
diff --git a/themes/platters/layouts/shortcodes/figures/railroad.html b/layouts/shortcodes/figures/railroad.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/figures/railroad.html
rename to layouts/shortcodes/figures/railroad.html
diff --git a/themes/platters/layouts/shortcodes/figures/youtube.html b/layouts/shortcodes/figures/youtube.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/figures/youtube.html
rename to layouts/shortcodes/figures/youtube.html
diff --git a/themes/platters/layouts/shortcodes/grid2.html b/layouts/shortcodes/grid2.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/grid2.html
rename to layouts/shortcodes/grid2.html
diff --git a/themes/platters/layouts/shortcodes/img.html b/layouts/shortcodes/img.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/img.html
rename to layouts/shortcodes/img.html
diff --git a/themes/platters/layouts/shortcodes/lang.html b/layouts/shortcodes/lang.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/lang.html
rename to layouts/shortcodes/lang.html
diff --git a/themes/platters/layouts/shortcodes/nethack/ascensions.html b/layouts/shortcodes/nethack/ascensions.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/nethack/ascensions.html
rename to layouts/shortcodes/nethack/ascensions.html
diff --git a/themes/platters/layouts/shortcodes/nethack/best_game.html b/layouts/shortcodes/nethack/best_game.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/nethack/best_game.html
rename to layouts/shortcodes/nethack/best_game.html
diff --git a/themes/platters/layouts/shortcodes/nethack/logfile.html b/layouts/shortcodes/nethack/logfile.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/nethack/logfile.html
rename to layouts/shortcodes/nethack/logfile.html
diff --git a/themes/platters/layouts/shortcodes/nethack/n.html b/layouts/shortcodes/nethack/n.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/nethack/n.html
rename to layouts/shortcodes/nethack/n.html
diff --git a/themes/platters/layouts/shortcodes/nethack/topn.html b/layouts/shortcodes/nethack/topn.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/nethack/topn.html
rename to layouts/shortcodes/nethack/topn.html
diff --git a/themes/platters/layouts/shortcodes/photo.html b/layouts/shortcodes/photo.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/photo.html
rename to layouts/shortcodes/photo.html
diff --git a/themes/platters/layouts/shortcodes/r.html b/layouts/shortcodes/r.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/r.html
rename to layouts/shortcodes/r.html
diff --git a/themes/platters/layouts/shortcodes/recent_posts.html b/layouts/shortcodes/recent_posts.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/recent_posts.html
rename to layouts/shortcodes/recent_posts.html
diff --git a/themes/platters/layouts/shortcodes/resume_flex.html b/layouts/shortcodes/resume_flex.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/resume_flex.html
rename to layouts/shortcodes/resume_flex.html
diff --git a/themes/platters/layouts/shortcodes/resume_section.html b/layouts/shortcodes/resume_section.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/resume_section.html
rename to layouts/shortcodes/resume_section.html
diff --git a/themes/platters/layouts/shortcodes/ruby.html b/layouts/shortcodes/ruby.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/ruby.html
rename to layouts/shortcodes/ruby.html
diff --git a/themes/platters/layouts/shortcodes/section.html b/layouts/shortcodes/section.html
similarity index 100%
rename from themes/platters/layouts/shortcodes/section.html
rename to layouts/shortcodes/section.html