diff --git a/book/installation-and-setup/figures/TB_user1.png b/book/installation-and-setup/figures/TB_user1.png
new file mode 100644
index 0000000..54e496e
Binary files /dev/null and b/book/installation-and-setup/figures/TB_user1.png differ
diff --git a/book/installation-and-setup/figures/TB_user2.png b/book/installation-and-setup/figures/TB_user2.png
new file mode 100644
index 0000000..82c9eef
Binary files /dev/null and b/book/installation-and-setup/figures/TB_user2.png differ
diff --git a/book/installation-and-setup/figures/TB_user3.png b/book/installation-and-setup/figures/TB_user3.png
new file mode 100644
index 0000000..5c24b30
Binary files /dev/null and b/book/installation-and-setup/figures/TB_user3.png differ
diff --git a/book/installation-and-setup/figures/TB_user4.png b/book/installation-and-setup/figures/TB_user4.png
new file mode 100644
index 0000000..0396a6f
Binary files /dev/null and b/book/installation-and-setup/figures/TB_user4.png differ
diff --git a/book/installation-and-setup/figures/TB_user5.png b/book/installation-and-setup/figures/TB_user5.png
new file mode 100644
index 0000000..f7ceeec
Binary files /dev/null and b/book/installation-and-setup/figures/TB_user5.png differ
diff --git a/book/installation-and-setup/figures/usertype1.jpg b/book/installation-and-setup/figures/usertype1.jpg
deleted file mode 100644
index f02af71..0000000
Binary files a/book/installation-and-setup/figures/usertype1.jpg and /dev/null differ
diff --git a/book/installation-and-setup/figures/usertype2.jpg b/book/installation-and-setup/figures/usertype2.jpg
deleted file mode 100644
index 9979094..0000000
Binary files a/book/installation-and-setup/figures/usertype2.jpg and /dev/null differ
diff --git a/book/installation-and-setup/figures/usertype3.jpg b/book/installation-and-setup/figures/usertype3.jpg
deleted file mode 100644
index 582e4fa..0000000
Binary files a/book/installation-and-setup/figures/usertype3.jpg and /dev/null differ
diff --git a/book/installation-and-setup/figures/usertype4.jpg b/book/installation-and-setup/figures/usertype4.jpg
deleted file mode 100644
index 19979da..0000000
Binary files a/book/installation-and-setup/figures/usertype4.jpg and /dev/null differ
diff --git a/book/installation-and-setup/figures/usertype5.jpg b/book/installation-and-setup/figures/usertype5.jpg
deleted file mode 100644
index 56c0786..0000000
Binary files a/book/installation-and-setup/figures/usertype5.jpg and /dev/null differ
diff --git a/book/installation-and-setup/user_types.md b/book/installation-and-setup/user_types.md
index efdde5c..c7f11e3 100644
--- a/book/installation-and-setup/user_types.md
+++ b/book/installation-and-setup/user_types.md
@@ -4,7 +4,7 @@ Different types of users will interact with the website or the Jupyter Books dif
 
 ## User type 1: Students providing feedback via the book website
 
-```{figure} figures/usertype1.jpg
+```{figure} figures/TB_user1.png
 ---
 name: usertype1
 width: 300px
@@ -22,7 +22,7 @@ There are multiple tools of providing feedback in the built book:
 
 ## User type 2: Colleague providing feedback on a draft website
 
-```{figure} figures/usertype2.jpg
+```{figure} figures/TB_user2.png
 ---
 name: usertype2
 width: 300px
@@ -36,7 +36,7 @@ In a similar manner as students, colleagues and team members can leave content-r
 
 ## User type 3: Colleague making adjustments via the browser
 
-```{figure} figures/usertype3.jpg
+```{figure} figures/TB_user3.png
 ---
 name: usertype3
 width: 300px
@@ -50,7 +50,7 @@ This type of user requires only very basic knowledge in GitLab/GitHub in order t
 
 ## User type 4: Colleague making adjustments locally
 
-```{figure} figures/usertype4.jpg
+```{figure} figures/TB_user4.png
 ---
 name: usertype4
 width: 300px
@@ -64,7 +64,7 @@ User 4 is a hybrid between type 3 and 5. Basically this user is making changes b
 
 ## User type 5: Colleague making adjustments and incorporating them in the book locally
 
-```{figure} figures/usertype5.jpg
+```{figure} figures/TB_user5.png
 ---
 name: usertype5
 width: 300px
diff --git a/book/intro/next.md b/book/intro/next.md
index 0afb7ae..475ec1a 100644
--- a/book/intro/next.md
+++ b/book/intro/next.md
@@ -4,7 +4,7 @@ You've seen what a JupyterBook is, how TeachBooks tries to help you with making
 
 In this manual we explain how to get going depending on the way you want to use it. If you successfully followed the steps until here, you'll be able to make book as a 'user type 3'!
 
-```{figure} ../installation-and-setup/figures/usertype3.jpg
+```{figure} ../installation-and-setup/figures/figures/TB_user3.png
 ---
 name: usertype1
 width: 300px
diff --git a/book/intro/template.md b/book/intro/template.md
index 82aba2f..b21b1a0 100644
--- a/book/intro/template.md
+++ b/book/intro/template.md
@@ -36,7 +36,6 @@ The exercises can be found in your book at `https://<username or organiszation_n
 name: exercises
 width: 200px
 align: center
-class: dark-light
 ```
 
 
diff --git a/book/intro/workflow.md b/book/intro/workflow.md
index 4e9aba1..bc0c038 100644
--- a/book/intro/workflow.md
+++ b/book/intro/workflow.md
@@ -9,7 +9,6 @@ Assuming you have a book (well make that happen soon!) and you're ready to colla
 ---
 width: 70px
 align: right
-class: dark-light
 ```
 You have an idea to improve a book or add some content! Let's make that happen! Share you idea with the book-authors to let them know you're starting something! Maybe someone else has some ideas on it as well. Later on, you can use GitHub `Issues`, `Projects` and `Milestones` to keep track of this.
 
@@ -18,7 +17,6 @@ You have an idea to improve a book or add some content! Let's make that happen!
 ---
 width: 100px
 align: right
-class: dark-light
 ```
 Let's create a space for you idea to form. You can create your own version of the book, visible for everyone to see. On GitHub, you'll use `branches` or `forks`.
 
@@ -27,7 +25,6 @@ Let's create a space for you idea to form. You can create your own version of th
 ---
 width: 100px
 align: right
-class: dark-light
 ```
 Creativity activated, let's start adding content to your book! You'll add text, images, videos, math, interactive quizes, coding, widgets, etc. As editing the book is not directly done in a graphical interface with buttons like Microsoft Word, you'll need to learn a bit of syntax. The [MyST syntax cheat sheet](https://jupyterbook.org/en/stable/reference/cheatsheet.html) will be added to your bookmarks. The changes you'll make have to be added to the GitHub version control system, creating `commits` on the your git `branch`.
 
@@ -36,7 +33,6 @@ Creativity activated, let's start adding content to your book! You'll add text,
 ---
 width: 100px
 align: right
-class: dark-light
 ```
 You've made a change, how does is look like? Your raw file have to be parsed. You can do that yourself or use the tooling provided by use in a GitHub `Action`. As soon as you uploaded (`pushed` in Git language) your changes to GitHub, it'll create a nice looking website for you!
 
@@ -45,7 +41,6 @@ You've made a change, how does is look like? Your raw file have to be parsed. Yo
 ---
 width: 100px
 align: right
-class: dark-light
 ```
 You'll make mistakes and you'll want to alter content... many, many times... As long as your idea is not ready to be shared with other, keep iterating step 3 and 4 until it's perfect!
 
@@ -54,7 +49,6 @@ You'll make mistakes and you'll want to alter content... many, many times... As
 ---
 width: 100px
 align: right
-class: dark-light
 ```
 You're done! Great! Now let's see what others think of your contribution. You'll submit your changes to the original book, in GitHub language this is called a `Pull request`. Other will be able to review, adapt and eventually `merge` your version into the book!