Clean up, fix, and improve templates around clipboard

1 job for master in 2 minutes and 34 seconds (queued for 3 seconds)