diff --git a/episodes/02-image-basics.md b/episodes/02-image-basics.md
index 5f77299c4..63b6106ce 100644
--- a/episodes/02-image-basics.md
+++ b/episodes/02-image-basics.md
@@ -115,7 +115,7 @@ from skimage.draw import disk  # form 3, load only the disk function
 import numpy as np             # form 4, load all of numpy into an object called np
 ```
 
-::::::::::::::  solution
+::::::::::::::::  spoiler
 
 ## Further Explanation
 
diff --git a/episodes/08-connected-components.md b/episodes/08-connected-components.md
index fb5ea8fd8..77d19d887 100644
--- a/episodes/08-connected-components.md
+++ b/episodes/08-connected-components.md
@@ -321,11 +321,7 @@ plt.imshow(labeled_image)
 plt.axis("off");
 ```
 
-:::::::::::::: {.empty-div style="margin-bottom: 50px"}
-<!-- This div is intentionally empty to allow the solution to float alone -->
-::::::::::::::
-
-::::::::::::::  solution
+::::::::::::::::  spoiler
 
 ## Color mappings
 
diff --git a/learners/setup.md b/learners/setup.md
index 53fff0131..329e994b8 100644
--- a/learners/setup.md
+++ b/learners/setup.md
@@ -70,11 +70,7 @@ e.g. your Desktop or a folder you have created for using in this workshop.
 
 3. Open a Jupyter notebook:
 
-   :::::::::::::: {.empty-div style="margin-bottom: 50px"}
-   <!-- This div is intentionally empty to allow the solution to float alone -->
-   ::::::::::::::
-
-   ::::::::::::::  solution
+   ::::::::::::::::  spoiler
 
    ## Instructions for Linux \& Mac
 
@@ -83,7 +79,7 @@ e.g. your Desktop or a folder you have created for using in this workshop.
 
    :::::::::::::::::::::::::
 
-   ::::::::::::::  solution
+   ::::::::::::::::  spoiler
 
    ## Instructions for Windows
 
@@ -119,11 +115,7 @@ e.g. your Desktop or a folder you have created for using in this workshop.
 
    Upon execution of the cell, a figure with two images should be displayed in an interactive widget. When hovering over the images with the mouse pointer, the pixel coordinates and colour values are displayed below the image.
 
-   :::::::::::::: {.empty-div style="margin-bottom: 50px"}
-   <!-- This div is intentionally empty to allow the solution to float alone -->
-   ::::::::::::::
-
-   ::::::::::::::  solution
+   ::::::::::::::::  spoiler
 
    ## Running Cells in a Notebook