diff --git a/exercises/01/readme.md b/exercises/01/readme.md
index 6e492b2..7a0ae1f 100644
--- a/exercises/01/readme.md
+++ b/exercises/01/readme.md
@@ -14,7 +14,7 @@ The CDS command line tool is the heart of everything you do when developing CAP
 
 :point_right: First, relate the `@sap` namespace to the SAP NPM registry:
 
-```shell
+```sh
 user@host:~
 => npm set @sap:registry=https://npm.sap.com
 ```
@@ -103,7 +103,7 @@ When successfully installed, you should see the extension thus (again, the versi
 
 :point_right: Run the following command from the terminal to check whether all required tools are installed (this is an experimental tool, please contact the instructor if you have any questions):
 
-```shell
+```sh
 npx check-sap-cloud-readiness -codejam-cap
 ```
 
diff --git a/exercises/05/readme.md b/exercises/05/readme.md
index b7be842..e4c97a2 100644
--- a/exercises/05/readme.md
+++ b/exercises/05/readme.md
@@ -228,8 +228,10 @@ curl \
   -d '{"ID": "527ef85a-aef2-464b-89f6-6a3ce64f2e14", "book_ID":427,"quantity":9}' \
   -H 'Content-Type: application/json' \
   http://localhost:4004/catalog/Orders
+```
 
-# For Windows users:
+For Windows users:
+```sh
 curl ^
   -d "{\"ID\": \"527ef85a-aef2-464b-89f6-6a3ce64f2e14\", \"book_ID\":427,\"quantity\":9}" ^
   -H "Content-Type: application/json" ^
diff --git a/exercises/06/readme.md b/exercises/06/readme.md
index 6436a18..d2034cd 100644
--- a/exercises/06/readme.md
+++ b/exercises/06/readme.md
@@ -34,8 +34,10 @@ curl \
   -d '{"ID": 162, "name": "Iain M Banks"}' \
   -H 'Content-Type: application/json' \
   http://localhost:4004/catalog/Authors
+```
 
-# For Windows users:
+For Windows users:
+```sh
 curl ^
   -d "{\"ID\": 162, \"name\": \"Iain M Banks\"}" ^
   -H "Content-Type: application/json" ^
@@ -49,8 +51,10 @@ curl \
   -d '{"ID": 44138, "title": "Consider Phlebas", "stock": 541, "author_ID": 162 }' \
   -H 'Content-Type: application/json' \
   http://localhost:4004/catalog/Books
+```
 
-# For Windows users:
+For Windows users:
+```sh
 curl ^
   -d "{\"ID\": 44138, \"title\": \"Consider Phlebas\", \"stock\": 541, \"author_ID\": 162 }" ^
   -H "Content-Type: application/json" ^
@@ -101,8 +105,10 @@ curl \
   -d '{"ID": 47110, "title": "The Player of Games", "stock": 405, "author_ID": 162 }' \
   -H 'Content-Type: application/json' \
   http://localhost:4004/catalog/Books
+```
 
-# For Windows users:
+For Windows users:
+```sh
 curl ^
   -d "{\"ID\": 47110, \"title\": \"The Player of Games\", \"stock\": 405, \"author_ID\": 162 }" ^
   -H "Content-Type: application/json" ^
@@ -132,8 +138,10 @@ You should also see a line in the terminal (where you invoked `cds serve all`) l
 curl \
   -X DELETE \
   'http://localhost:4004/catalog/Books(251)'
+```
 
-# For Windows users:
+For Windows users:
+```sh
 curl ^
 -X DELETE ^
 "http://localhost:4004/catalog/Books(251)"
diff --git a/exercises/07/readme.md b/exercises/07/readme.md
index 3f9581a..8e7eb62 100644
--- a/exercises/07/readme.md
+++ b/exercises/07/readme.md
@@ -65,8 +65,10 @@ curl \
   -d '{"book_ID":201,"quantity":2}' \
   -H 'Content-Type: application/json' \
   http://localhost:4004/catalog/Orders
+```
 
-# For Windows users:
+For Windows users:
+```sh
 curl ^
   -d "{\"book_ID\": 201, \"quantity\": 2}" ^
   -H "Content-Type: application/json" ^
@@ -80,8 +82,10 @@ curl \
   -d '{"book_ID":252,"quantity":7}' \
   -H 'Content-Type: application/json' \
   http://localhost:4004/catalog/Orders
+```
 
-# For Windows users:
+For Windows users:
+```sh
 curl ^
   -d "{\"book_ID\": 252, \"quantity\": 7}" ^
   -H "Content-Type: application/json" ^
@@ -95,8 +99,10 @@ curl \
   -d '{"book_ID":421,"quantity":42}' \
   -H 'Content-Type: application/json' \
   http://localhost:4004/catalog/Orders
+```
 
-# For Windows users:
+For Windows users:
+```sh
 curl ^
   -d "{\"book_ID\": 421, \"quantity\": 42}" ^
   -H "Content-Type: application/json" ^