diff --git a/common-content/en/blocks/afternoon-break/index.md b/common-content/en/blocks/afternoon-break/index.md
index 70aa5ca78..11ec36d4c 100644
--- a/common-content/en/blocks/afternoon-break/index.md
+++ b/common-content/en/blocks/afternoon-break/index.md
@@ -1,5 +1,6 @@
 +++
 title="Afternoon Break"
+emoji="🫖"
 time= 15
 hide_from_overview=true
 [build]
diff --git a/common-content/en/blocks/ask-me-anything/index.md b/common-content/en/blocks/ask-me-anything/index.md
index 479bb7490..9eb89de6f 100644
--- a/common-content/en/blocks/ask-me-anything/index.md
+++ b/common-content/en/blocks/ask-me-anything/index.md
@@ -1,6 +1,6 @@
 +++
 title="Experts AMA"
-
+emoji="🧑🏼‍🎓"
 time=45
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/backlog/index.md b/common-content/en/blocks/backlog/index.md
index 54ec9ad24..283829cd2 100644
--- a/common-content/en/blocks/backlog/index.md
+++ b/common-content/en/blocks/backlog/index.md
@@ -1,6 +1,6 @@
 +++
 title="Backlog"
-
+emoji="📝"
 time= 30
 vocabulary="Backlog"
 hide_from_overview=true
diff --git a/common-content/en/blocks/blockers/index.md b/common-content/en/blocks/blockers/index.md
index 3bfee7e71..9c01db1f7 100644
--- a/common-content/en/blocks/blockers/index.md
+++ b/common-content/en/blocks/blockers/index.md
@@ -1,6 +1,6 @@
 +++
 title="Blockers!"
-
+emoji="🚗"
 time=50
 [objectives]
     1="Use the driver and navigator pattern"
diff --git a/common-content/en/blocks/break/index.md b/common-content/en/blocks/break/index.md
index 0c77ead24..a376c3145 100644
--- a/common-content/en/blocks/break/index.md
+++ b/common-content/en/blocks/break/index.md
@@ -1,6 +1,6 @@
 +++
 title="Break"
-
+emoji="🫖"
 time=15
 hide_from_overview=true
 [build]
diff --git a/common-content/en/blocks/coding-101/index.md b/common-content/en/blocks/coding-101/index.md
index 0486d9d93..c8508293e 100644
--- a/common-content/en/blocks/coding-101/index.md
+++ b/common-content/en/blocks/coding-101/index.md
@@ -1,5 +1,6 @@
 +++
 title="Coding 101"
+emoji="💻"
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/blocks/coursework/index.md b/common-content/en/blocks/coursework/index.md
index 4b377b681..dc0173397 100644
--- a/common-content/en/blocks/coursework/index.md
+++ b/common-content/en/blocks/coursework/index.md
@@ -1,5 +1,6 @@
 +++
 title="Coursework"
+emoji="📚"
 time= 120
 vocabulary="Coursework"
 [build]
diff --git a/common-content/en/blocks/demo/index.md b/common-content/en/blocks/demo/index.md
index 35566e72e..98e58fe0f 100644
--- a/common-content/en/blocks/demo/index.md
+++ b/common-content/en/blocks/demo/index.md
@@ -1,6 +1,6 @@
 +++
 title="Demo"
-
+emoji="🎤"
 time=60
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/energiser/index.md b/common-content/en/blocks/energiser/index.md
index 7baac722e..9c1ea6260 100644
--- a/common-content/en/blocks/energiser/index.md
+++ b/common-content/en/blocks/energiser/index.md
@@ -1,6 +1,6 @@
 +++
 title="Energiser"
-
+emoji="🔋"
 time=20
 hide_from_overview=true
 [build]
diff --git a/common-content/en/blocks/evaluate/index.md b/common-content/en/blocks/evaluate/index.md
index 891b8d2f9..29969c01c 100644
--- a/common-content/en/blocks/evaluate/index.md
+++ b/common-content/en/blocks/evaluate/index.md
@@ -1,6 +1,6 @@
 +++
-title="Evaluate ✏️"
-
+title="Evaluate"
+emoji="✏️"
 time= 60
 [tasks]
     1="Evaluate your current progress against previous modules"
diff --git a/common-content/en/blocks/games/index.md b/common-content/en/blocks/games/index.md
index ab23e9b0e..1a10f8784 100644
--- a/common-content/en/blocks/games/index.md
+++ b/common-content/en/blocks/games/index.md
@@ -1,6 +1,6 @@
 +++
-title="Games, rules, logic, and strategy 🎲"
-
+title="Games, rules, logic, and strategy"
+emoji="🎲"
 time=25
 hide_from_overview=true
 [build]
diff --git a/common-content/en/blocks/get-how-computers-really-work/index.md b/common-content/en/blocks/get-how-computers-really-work/index.md
index e8edf0139..1f59cae7e 100644
--- a/common-content/en/blocks/get-how-computers-really-work/index.md
+++ b/common-content/en/blocks/get-how-computers-really-work/index.md
@@ -1,5 +1,6 @@
 +++
 title = "Get a copy of How Computers Really Work"
+emoji = "📚"
 time = 5
 hide_from_overview = true
 [build]
@@ -12,4 +13,4 @@ Throughout this course, we will reference the book [How Computers Really Work](h
 
 You will need a copy. {{<our-name>}} is working out how to get you a copy if you can't afford one.
 
-If you buy your own copy [from e.g. Amazon](https://www.amazon.co.uk/How-Computers-Work-Hands-Workings/dp/1718500661), {{<our-name>}} cannot pay for this. 
+If you buy your own copy [from e.g. Amazon](https://www.amazon.co.uk/How-Computers-Work-Hands-Workings/dp/1718500661), {{<our-name>}} cannot pay for this.
diff --git a/common-content/en/blocks/group-discussion/index.md b/common-content/en/blocks/group-discussion/index.md
index 81bf8f782..6e105ba93 100644
--- a/common-content/en/blocks/group-discussion/index.md
+++ b/common-content/en/blocks/group-discussion/index.md
@@ -1,6 +1,6 @@
 +++
 title="Group Discussion"
-
+emoji="🗣️"
 time=75
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/house-rules/index.md b/common-content/en/blocks/house-rules/index.md
index 43d2be13f..9374ffd9a 100644
--- a/common-content/en/blocks/house-rules/index.md
+++ b/common-content/en/blocks/house-rules/index.md
@@ -1,5 +1,6 @@
 +++
 title="House Rules"
+emoji="🏠"
 time=10
 objectives=["Explain the reason for each house rule"]
 hide_from_overview=true
diff --git a/common-content/en/blocks/kata/index.md b/common-content/en/blocks/kata/index.md
index 0f5792060..1ee5fabba 100644
--- a/common-content/en/blocks/kata/index.md
+++ b/common-content/en/blocks/kata/index.md
@@ -1,6 +1,6 @@
 +++
 title="Kata"
-
+emoji="🥋"
 time= 30
 [objectives]
     1="Write a failing test"
diff --git a/common-content/en/blocks/lunch/index.md b/common-content/en/blocks/lunch/index.md
index b75239828..8be58439b 100644
--- a/common-content/en/blocks/lunch/index.md
+++ b/common-content/en/blocks/lunch/index.md
@@ -1,6 +1,6 @@
 +++
 title="Community Lunch"
-
+emoji="🍽️"
 time=60
 hide_from_overview=true
 [build]
diff --git a/common-content/en/blocks/mentored-code-review/index.md b/common-content/en/blocks/mentored-code-review/index.md
index 43946134d..410ffec52 100644
--- a/common-content/en/blocks/mentored-code-review/index.md
+++ b/common-content/en/blocks/mentored-code-review/index.md
@@ -1,6 +1,6 @@
 +++
 title="Mentored code review"
-
+emoji="🧑🏾‍💻"
 time = 20
 [objectives]
     1="Explain what a code reviewer is looking for in a PR."
@@ -20,7 +20,7 @@ At {{<our-name>}} every learner should get code review on their work every week.
 
 {{<note type="activity" title="Live Code Review">}}
 
-Pair up a volunteer with one or more learners. 
+Pair up a volunteer with one or more learners.
 
 - The volunteer will review a pull request, and talk out loud about what they're looking for and doing.
 - The learner(s) will ask questions as they do.
diff --git a/common-content/en/blocks/morning-break/index.md b/common-content/en/blocks/morning-break/index.md
index ff61fa114..84c37cdba 100644
--- a/common-content/en/blocks/morning-break/index.md
+++ b/common-content/en/blocks/morning-break/index.md
@@ -1,6 +1,6 @@
 +++
 title="Morning Break"
-
+emoji="🫖"
 time=15
 hide_from_overview=true
 [build]
diff --git a/common-content/en/blocks/prep-dir-tests/index.md b/common-content/en/blocks/prep-dir-tests/index.md
index fd3f17d30..7676fa93a 100644
--- a/common-content/en/blocks/prep-dir-tests/index.md
+++ b/common-content/en/blocks/prep-dir-tests/index.md
@@ -2,7 +2,7 @@
 title = 'Creating test files'
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🧪'
 [objectives]
     1='Create files for the first problem'
     2="Open the first problem in your prep directory"
diff --git a/common-content/en/blocks/prep-dir/index.md b/common-content/en/blocks/prep-dir/index.md
index c7e21fc10..5ce7ee89d 100644
--- a/common-content/en/blocks/prep-dir/index.md
+++ b/common-content/en/blocks/prep-dir/index.md
@@ -2,7 +2,7 @@
 title = 'Prep dir'
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '📂'
 [objectives]
     1='Create a working prep directory for the module'
 [build]
diff --git a/common-content/en/blocks/register/index.md b/common-content/en/blocks/register/index.md
index ec613eac3..6d17ba698 100644
--- a/common-content/en/blocks/register/index.md
+++ b/common-content/en/blocks/register/index.md
@@ -1,5 +1,6 @@
 +++
-title="✍🏽 Register"
+title="Register"
+emoji="✍🏽"
 time=5
 hide_from_overview=true
 [build]
diff --git a/common-content/en/blocks/requirements/index.md b/common-content/en/blocks/requirements/index.md
index 51fc1bd17..b8d7e7972 100644
--- a/common-content/en/blocks/requirements/index.md
+++ b/common-content/en/blocks/requirements/index.md
@@ -4,7 +4,7 @@ title = 'Understanding Requirements'
 time = 20
 facilitation = false
 vocabulary=["Requirements", "User Stories"]
-emoji= '🧩'
+emoji= '🎯'
 [objectives]
 1='Identify described requirements'
     2='Identify extra requirements from your own experience'
diff --git a/common-content/en/blocks/retro/index.md b/common-content/en/blocks/retro/index.md
index c3a47dc2b..187a1fb29 100644
--- a/common-content/en/blocks/retro/index.md
+++ b/common-content/en/blocks/retro/index.md
@@ -1,5 +1,6 @@
 +++
 title="Retro: Start / Stop / Continue"
+emoji="🔄"
 description="Retro on the class day and the sprint"
 time= 25
 hide_from_overview=true
diff --git a/common-content/en/blocks/search-terms/index.md b/common-content/en/blocks/search-terms/index.md
index ddf170536..f8ec2b7c5 100644
--- a/common-content/en/blocks/search-terms/index.md
+++ b/common-content/en/blocks/search-terms/index.md
@@ -1,6 +1,6 @@
 +++
 title="Search terms"
-
+emoji="🔍"
 time= 1
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/setup-project-teams/index.md b/common-content/en/blocks/setup-project-teams/index.md
index fdedf6dca..7d2a6bb27 100644
--- a/common-content/en/blocks/setup-project-teams/index.md
+++ b/common-content/en/blocks/setup-project-teams/index.md
@@ -1,6 +1,6 @@
 +++
-title="🫱🏽‍🫲🏾 Setup project teams"
-
+title="Setup project teams"
+emoji="🫱🏽‍🫲🏾"
 time=60
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/spaced-repetition/index.md b/common-content/en/blocks/spaced-repetition/index.md
index 1cd52844b..475d6a990 100644
--- a/common-content/en/blocks/spaced-repetition/index.md
+++ b/common-content/en/blocks/spaced-repetition/index.md
@@ -1,6 +1,6 @@
 +++
 title="Spaced Repetition"
-
+emoji="🔁"
 time= 10
 hide_from_overview=true
 [build]
diff --git a/common-content/en/blocks/standup/index.md b/common-content/en/blocks/standup/index.md
index df4ea2f63..9e9ed81b5 100644
--- a/common-content/en/blocks/standup/index.md
+++ b/common-content/en/blocks/standup/index.md
@@ -1,5 +1,6 @@
 +++
 title="Standup"
+emoji="📢"
 time=15
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/study-group/index.md b/common-content/en/blocks/study-group/index.md
index b48d1c7cc..c68146dda 100644
--- a/common-content/en/blocks/study-group/index.md
+++ b/common-content/en/blocks/study-group/index.md
@@ -1,5 +1,6 @@
 +++
 title="Study Group"
+emoji="🛗"
 tasks=["Resolve blockers in your coursework", "Express and resolve problems effectively by writing tickets and asking questions", "Give and receive code review", "Develop your personal portfolio", "Pair programme", "Evaluate your progress with peers and mentors"]
 time=60
 [build]
diff --git a/common-content/en/blocks/success-criteria/index.md b/common-content/en/blocks/success-criteria/index.md
index fbbbdf3eb..d0f931a95 100644
--- a/common-content/en/blocks/success-criteria/index.md
+++ b/common-content/en/blocks/success-criteria/index.md
@@ -1,6 +1,6 @@
 +++
-title="✅ Check module success criteria"
-
+title="Check module success criteria"
+emoji="✅"
 time= 10
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/telephone/index.md b/common-content/en/blocks/telephone/index.md
index 91a3ca18c..d2f272b7e 100644
--- a/common-content/en/blocks/telephone/index.md
+++ b/common-content/en/blocks/telephone/index.md
@@ -1,6 +1,6 @@
 +++
 title="Telephone"
-
+emoji="📞"
 time=15
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/useful-links/index.md b/common-content/en/blocks/useful-links/index.md
index 26590c71c..1ff9e3a10 100644
--- a/common-content/en/blocks/useful-links/index.md
+++ b/common-content/en/blocks/useful-links/index.md
@@ -1,5 +1,6 @@
 +++
 title="Useful Links"
+emoji="🔗"
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/blocks/user-stories/index.md b/common-content/en/blocks/user-stories/index.md
index 413025b86..fcb86995e 100644
--- a/common-content/en/blocks/user-stories/index.md
+++ b/common-content/en/blocks/user-stories/index.md
@@ -1,10 +1,9 @@
 +++
 title = 'User stories'
-
 time = 50
 facilitation = false
 vocabulary=["Requirements", "User Stories"]
-emoji= '🧩'
+emoji= '👤'
 [objectives]
     1='Identify described requirements'
     2='Identify extra requirements from your own experience'
diff --git a/common-content/en/blocks/wordle/index.md b/common-content/en/blocks/wordle/index.md
index e2eb3ebd5..09b4e179b 100644
--- a/common-content/en/blocks/wordle/index.md
+++ b/common-content/en/blocks/wordle/index.md
@@ -1,6 +1,6 @@
 +++
 title="Play Wordle"
-
+emoji="🍎"
 time= 5
 [build]
   render = 'never'
@@ -9,4 +9,4 @@ time= 5
 
 +++
 
-<iframe src="https://www.nytimes.com/games/wordle/index.html" width="100%" height="640px"></iframe>
+> https://www.nytimes.com/games/wordle/index.html
diff --git a/common-content/en/blocks/workshop/index.md b/common-content/en/blocks/workshop/index.md
index e685645d9..93f1de556 100644
--- a/common-content/en/blocks/workshop/index.md
+++ b/common-content/en/blocks/workshop/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🧰 Workshop Activity'
+title = 'Workshop Activity'
 
 time = 120
 emoji= '🧰'
diff --git a/common-content/en/blocks/wrap-party/index.md b/common-content/en/blocks/wrap-party/index.md
index a8b33716c..fe2848faa 100644
--- a/common-content/en/blocks/wrap-party/index.md
+++ b/common-content/en/blocks/wrap-party/index.md
@@ -1,5 +1,6 @@
 +++
 title="Wrap Party"
+emoji="🥳"
 time=180
 [build]
   render = 'never'
diff --git a/common-content/en/blocks/wrap/index.md b/common-content/en/blocks/wrap/index.md
index 40066a247..127421e3c 100644
--- a/common-content/en/blocks/wrap/index.md
+++ b/common-content/en/blocks/wrap/index.md
@@ -1,5 +1,6 @@
 +++
 title="Wrap"
+emoji="🎉"
 time=20
 [build]
   render = 'never'
diff --git a/common-content/en/energisers/confident-presenting/index.md b/common-content/en/energisers/confident-presenting/index.md
index df0795961..0182ce3fc 100644
--- a/common-content/en/energisers/confident-presenting/index.md
+++ b/common-content/en/energisers/confident-presenting/index.md
@@ -1,5 +1,6 @@
 +++
 title="Confident Presenting!"
+emoji='🦸‍♂️'
 time=15
 [tasks]
     1="Trainee can strike a power pose"
diff --git a/common-content/en/energisers/time-traveller/index.md b/common-content/en/energisers/time-traveller/index.md
index ee54312bd..b992accb0 100644
--- a/common-content/en/energisers/time-traveller/index.md
+++ b/common-content/en/energisers/time-traveller/index.md
@@ -1,6 +1,6 @@
 +++
 title="Time traveller"
-emoji="⏰"
+emoji="⏳"
 time=30
 [tasks]
     1="Hear the experience of a CYF alumni"
diff --git a/common-content/en/module/cloud/actions/index.md b/common-content/en/module/cloud/actions/index.md
index 89d40199e..1e42f63be 100644
--- a/common-content/en/module/cloud/actions/index.md
+++ b/common-content/en/module/cloud/actions/index.md
@@ -3,7 +3,7 @@ title = 'Learning GitHub Actions Basics'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🤖'
 [objectives]
     1='Describe GitHub Actions workflows, jobs, steps, and actions.'
     2='Set up a basic CI/CD pipeline using GitHub Actions in a GitHub repository'
diff --git a/common-content/en/module/cloud/alerts-and-metrics/index.md b/common-content/en/module/cloud/alerts-and-metrics/index.md
index 19caf1176..a272fc16d 100644
--- a/common-content/en/module/cloud/alerts-and-metrics/index.md
+++ b/common-content/en/module/cloud/alerts-and-metrics/index.md
@@ -3,7 +3,7 @@ title = 'Creating Alerts and Understanding Metrics'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🚨'
 [objectives]
     1='Create an alert in Cloudwatch'
 [build]
diff --git a/common-content/en/module/cloud/deployment-stage/index.md b/common-content/en/module/cloud/deployment-stage/index.md
index 9fbf857c8..2db719102 100644
--- a/common-content/en/module/cloud/deployment-stage/index.md
+++ b/common-content/en/module/cloud/deployment-stage/index.md
@@ -3,7 +3,7 @@ title = 'Adding Deployment Stages'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🚀'
 [objectives]
     1='Integrate deployment scripts into the GitHub Actions workflow'
 [build]
diff --git a/common-content/en/module/cloud/entry-criteria/index.md b/common-content/en/module/cloud/entry-criteria/index.md
index 7a81d4426..ea453dff4 100644
--- a/common-content/en/module/cloud/entry-criteria/index.md
+++ b/common-content/en/module/cloud/entry-criteria/index.md
@@ -3,7 +3,7 @@ title = 'Entry Criteria'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🎯'
 [objectives]
     1='List the entry criteria for the Cloud module'
 [build]
diff --git a/common-content/en/module/cloud/environment-variables/index.md b/common-content/en/module/cloud/environment-variables/index.md
index 4a4dc4d1e..8ab168b8a 100644
--- a/common-content/en/module/cloud/environment-variables/index.md
+++ b/common-content/en/module/cloud/environment-variables/index.md
@@ -3,7 +3,7 @@ title = 'Environment Variables'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🔐'
 [objectives]
     1='Automate the deployment process to a specified environment.'
 [build]
diff --git a/common-content/en/module/cloud/multiple-jobs/index.md b/common-content/en/module/cloud/multiple-jobs/index.md
index 239dcce53..131532938 100644
--- a/common-content/en/module/cloud/multiple-jobs/index.md
+++ b/common-content/en/module/cloud/multiple-jobs/index.md
@@ -3,7 +3,7 @@ title = 'Creating a Workflow with Multiple Jobs'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🔁'
 [objectives]
     1='Implement a multi-job workflow where jobs run sequentially, based on dependencies and requirements'
     2='Use the needs keyword to specify job dependencies'
diff --git a/common-content/en/module/cloud/scalability-cloud/index.md b/common-content/en/module/cloud/scalability-cloud/index.md
index 111e44524..22d87165e 100644
--- a/common-content/en/module/cloud/scalability-cloud/index.md
+++ b/common-content/en/module/cloud/scalability-cloud/index.md
@@ -3,7 +3,7 @@ title = 'Implementing Scalability in the Cloud'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🛸'
 [objectives]
     1='Identify a strategy for achieving vertical scaling with AWS RDS'
     2='Explain how to use horizontal autoscaling with AWS EC2'
diff --git a/common-content/en/module/cloud/scalability-monitoring/index.md b/common-content/en/module/cloud/scalability-monitoring/index.md
index 2716e5811..58c5a8bc2 100644
--- a/common-content/en/module/cloud/scalability-monitoring/index.md
+++ b/common-content/en/module/cloud/scalability-monitoring/index.md
@@ -3,7 +3,7 @@ title = 'Monitoring Tools'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🤿'
 [objectives]
     1='List the benefits of monitoring'
     2='Define observability'
diff --git a/common-content/en/module/cloud/scalability-types/index.md b/common-content/en/module/cloud/scalability-types/index.md
index 1934ecc45..1d67e047f 100644
--- a/common-content/en/module/cloud/scalability-types/index.md
+++ b/common-content/en/module/cloud/scalability-types/index.md
@@ -3,7 +3,7 @@ title = 'Types of scalability'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '📈'
 [objectives]
     1='Identify the difference between vertical and horizontal scaling'
 [build]
diff --git a/common-content/en/module/cloud/secrets/index.md b/common-content/en/module/cloud/secrets/index.md
index 710dc27ea..be593fddd 100644
--- a/common-content/en/module/cloud/secrets/index.md
+++ b/common-content/en/module/cloud/secrets/index.md
@@ -3,7 +3,7 @@ title = 'Secrets'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🔒'
 [objectives]
     1='TODO'
 [build]
diff --git a/common-content/en/module/cloud/setup-aws/index.md b/common-content/en/module/cloud/setup-aws/index.md
index f3ac05d81..c823751af 100644
--- a/common-content/en/module/cloud/setup-aws/index.md
+++ b/common-content/en/module/cloud/setup-aws/index.md
@@ -1,12 +1,6 @@
 +++
 title = 'template'
-
-time = 20
-facilitation = false
-emoji= '🍬'
-[objectives]
-    1='Define syntactic sugar'
-    2='Write a function using the async keyword'
+time = 0
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/cloud/setup-budget/index.md b/common-content/en/module/cloud/setup-budget/index.md
index f3ac05d81..c823751af 100644
--- a/common-content/en/module/cloud/setup-budget/index.md
+++ b/common-content/en/module/cloud/setup-budget/index.md
@@ -1,12 +1,6 @@
 +++
 title = 'template'
-
-time = 20
-facilitation = false
-emoji= '🍬'
-[objectives]
-    1='Define syntactic sugar'
-    2='Write a function using the async keyword'
+time = 0
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/cloud/setup-mfa/index.md b/common-content/en/module/cloud/setup-mfa/index.md
index bbb3ef782..c823751af 100644
--- a/common-content/en/module/cloud/setup-mfa/index.md
+++ b/common-content/en/module/cloud/setup-mfa/index.md
@@ -1,12 +1,6 @@
 +++
-title = ' template'
-
-time = 20
-facilitation = false
-emoji= '🍬'
-[objectives]
-    1='Define syntactic sugar'
-    2='Write a function using the async keyword'
+title = 'template'
+time = 0
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/cloud/template/index.md b/common-content/en/module/cloud/template/index.md
index 2490df825..c823751af 100644
--- a/common-content/en/module/cloud/template/index.md
+++ b/common-content/en/module/cloud/template/index.md
@@ -1,12 +1,6 @@
 +++
 title = 'template'
-
-time = 20
-facilitation = false
-emoji= '🧩'
-[objectives]
-    1='Define syntactic sugar'
-    2='Write a function using the async keyword'
+time = 0
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/cloud/terraform-how/index.md b/common-content/en/module/cloud/terraform-how/index.md
index b54caa59c..9496cfc3c 100644
--- a/common-content/en/module/cloud/terraform-how/index.md
+++ b/common-content/en/module/cloud/terraform-how/index.md
@@ -3,7 +3,7 @@ title = 'How does terraform work?'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🌎'
 [objectives]
     1='List the workflow steps of Terraform'
 [build]
diff --git a/common-content/en/module/cloud/terraform-intro/index.md b/common-content/en/module/cloud/terraform-intro/index.md
index 4bd1831d3..c725b2de4 100644
--- a/common-content/en/module/cloud/terraform-intro/index.md
+++ b/common-content/en/module/cloud/terraform-intro/index.md
@@ -3,7 +3,7 @@ title = 'Introduction to Terraform'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🌎'
 [objectives]
     1='Explain the purpose of Terraform'
     2='List the core concepts in Terraform'
diff --git a/common-content/en/module/cloud/terraform-state/index.md b/common-content/en/module/cloud/terraform-state/index.md
index 187d683e1..66105057c 100644
--- a/common-content/en/module/cloud/terraform-state/index.md
+++ b/common-content/en/module/cloud/terraform-state/index.md
@@ -3,7 +3,7 @@ title = 'Terraform State Management and Backends'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🔏'
 [objectives]
     1='Define state locking in Terraform'
 [build]
diff --git a/common-content/en/module/cloud/test-stage/index.md b/common-content/en/module/cloud/test-stage/index.md
index b4ec70753..2229e0d21 100644
--- a/common-content/en/module/cloud/test-stage/index.md
+++ b/common-content/en/module/cloud/test-stage/index.md
@@ -3,7 +3,7 @@ title = 'Adding Testing Stages'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🧪'
 [objectives]
     1='Add a test stage to a GitHub action'
     2='Integrate existing test scripts to run automatically'
diff --git a/common-content/en/module/cloud/what-is-infra-as-code/index.md b/common-content/en/module/cloud/what-is-infra-as-code/index.md
index 9811ea0a9..855cd2ff4 100644
--- a/common-content/en/module/cloud/what-is-infra-as-code/index.md
+++ b/common-content/en/module/cloud/what-is-infra-as-code/index.md
@@ -3,7 +3,7 @@ title = 'What is infrastructure as code?'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🏗️'
 [objectives]
     1='Define infrastructure as code'
     2='Explain the need for infrastructure as code'
diff --git a/common-content/en/module/cloud/what-is-scalability/index.md b/common-content/en/module/cloud/what-is-scalability/index.md
index 3a3dff273..e9a26c570 100644
--- a/common-content/en/module/cloud/what-is-scalability/index.md
+++ b/common-content/en/module/cloud/what-is-scalability/index.md
@@ -3,7 +3,7 @@ title = 'What is scalability?'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '📈'
 [objectives]
     1='Define scalability'
 [build]
diff --git a/common-content/en/module/cloud/why-scalability/index.md b/common-content/en/module/cloud/why-scalability/index.md
index e312d2877..712bbac9e 100644
--- a/common-content/en/module/cloud/why-scalability/index.md
+++ b/common-content/en/module/cloud/why-scalability/index.md
@@ -3,7 +3,7 @@ title = 'Why is scalability important?'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🎚️'
 [objectives]
     1='List the benefits and challenges of scalability'
 [build]
diff --git a/common-content/en/module/cloud/writing-infra-code/index.md b/common-content/en/module/cloud/writing-infra-code/index.md
index a103a67bf..63dd33ae6 100644
--- a/common-content/en/module/cloud/writing-infra-code/index.md
+++ b/common-content/en/module/cloud/writing-infra-code/index.md
@@ -1,12 +1,10 @@
 +++
 title = 'Writing Basic Infrastructure Code'
-
+emoji="🖨️"
 time = 30
 facilitation = false
-emoji= '🧩'
 [objectives]
-    1='Define syntactic sugar'
-    2='Write a function using the async keyword'
+    1='Define a null resource in Terraform'
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/databases/communicating-with-db/index.md b/common-content/en/module/databases/communicating-with-db/index.md
index f5cddb94a..b4c8a032b 100644
--- a/common-content/en/module/databases/communicating-with-db/index.md
+++ b/common-content/en/module/databases/communicating-with-db/index.md
@@ -3,7 +3,7 @@ title = 'Communicating with the database using SQL'
 
 time = 120
 facilitation = false
-emoji= '🧩'
+emoji= '🏓'
 [objectives]
     1='Describe what `tables`, `rows` and `columns` are used for in a relational database'
     2='Retrieve data from a table using PostgreSQL'
diff --git a/common-content/en/module/databases/creating-a-table/index.md b/common-content/en/module/databases/creating-a-table/index.md
index e12d0834d..fbc8e900e 100644
--- a/common-content/en/module/databases/creating-a-table/index.md
+++ b/common-content/en/module/databases/creating-a-table/index.md
@@ -3,7 +3,7 @@ title = 'Creating a table'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '🧮'
 [objectives]
     1='Aggregate data over multiple rows and use aggregate values to restrict the results'
 [build]
diff --git a/common-content/en/module/databases/crud/index.md b/common-content/en/module/databases/crud/index.md
index 661209679..4e38cab72 100644
--- a/common-content/en/module/databases/crud/index.md
+++ b/common-content/en/module/databases/crud/index.md
@@ -3,7 +3,7 @@ title = 'CRUD operations with NodeJS and PostgreSQL'
 
 time = 120
 facilitation = false
-emoji= '🧩'
+emoji= '🪄'
 [objectives]
     1="Create an API endpoint that can create data in a database"
     2="Create an API endpoint that can delete data from a database"
diff --git a/common-content/en/module/databases/defining-keys/index.md b/common-content/en/module/databases/defining-keys/index.md
index efbaaea3f..d948054b5 100644
--- a/common-content/en/module/databases/defining-keys/index.md
+++ b/common-content/en/module/databases/defining-keys/index.md
@@ -3,7 +3,7 @@ title = 'Defining Primary and Foreign Keys'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '🔑'
 [objectives]
     1='Aggregate data over multiple rows and use aggregate values to restrict the results'
 [build]
diff --git a/common-content/en/module/databases/integration-with-node/index.md b/common-content/en/module/databases/integration-with-node/index.md
index d6ecba169..c811c94db 100644
--- a/common-content/en/module/databases/integration-with-node/index.md
+++ b/common-content/en/module/databases/integration-with-node/index.md
@@ -3,7 +3,7 @@ title = 'Integration with NodeJS'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '☎️'
 [objectives]
     1='Connect a PostgreSQL database to a NodeJS application'
     2='Retrieve data from a PostgreSQL database in a NodeJS application'
diff --git a/common-content/en/module/databases/introduction-to-db/index.md b/common-content/en/module/databases/introduction-to-db/index.md
index 9fa77f55a..eb1288c9b 100644
--- a/common-content/en/module/databases/introduction-to-db/index.md
+++ b/common-content/en/module/databases/introduction-to-db/index.md
@@ -3,7 +3,7 @@ title = 'Introduction to databases'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '💾'
 [objectives]
     1='Explain why databases are needed in Web Development'
 [build]
diff --git a/common-content/en/module/databases/introduction-to-postgresql/index.md b/common-content/en/module/databases/introduction-to-postgresql/index.md
index 8e529fdab..7d297ecac 100644
--- a/common-content/en/module/databases/introduction-to-postgresql/index.md
+++ b/common-content/en/module/databases/introduction-to-postgresql/index.md
@@ -3,7 +3,7 @@ title = 'Introduction to PostgreSQL'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🐘'
 [objectives]
     1='Define what SQL is and what it is used for'
     2='Define an RDBMS'
diff --git a/common-content/en/module/databases/joining-tables/index.md b/common-content/en/module/databases/joining-tables/index.md
index 1422ca192..f167cbaab 100644
--- a/common-content/en/module/databases/joining-tables/index.md
+++ b/common-content/en/module/databases/joining-tables/index.md
@@ -3,7 +3,7 @@ title = 'Joining Tables'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '🔗'
 [objectives]
     1='Combine tables together using `INNER JOIN`'
 [build]
diff --git a/common-content/en/module/databases/macos-setup/index.md b/common-content/en/module/databases/macos-setup/index.md
index bb1b6da5a..7f3ef5b0d 100644
--- a/common-content/en/module/databases/macos-setup/index.md
+++ b/common-content/en/module/databases/macos-setup/index.md
@@ -3,7 +3,7 @@ title = 'Mac-OS setup'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '🍏'
 [objectives]
      1='Set up PostgresQL on Mac-OS'
 [build]
diff --git a/common-content/en/module/databases/more-selective/index.md b/common-content/en/module/databases/more-selective/index.md
index 5f488fac4..5bf7aafbd 100644
--- a/common-content/en/module/databases/more-selective/index.md
+++ b/common-content/en/module/databases/more-selective/index.md
@@ -3,7 +3,7 @@ title = 'Being More Selective'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🔍'
 [objectives]
     1='Create an API endpoint that can add data to a database'
     2='Validate data before adding it to a database'
diff --git a/common-content/en/module/databases/recap-node/index.md b/common-content/en/module/databases/recap-node/index.md
index 29e43c70c..bd7cbeced 100644
--- a/common-content/en/module/databases/recap-node/index.md
+++ b/common-content/en/module/databases/recap-node/index.md
@@ -3,7 +3,7 @@ title = 'Communicating with the database using SQL'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '📮'
 [objectives]
     1='Check the database connection'
     2='Get query results from the database with Postman'
diff --git a/common-content/en/module/databases/ubuntu-setup/index.md b/common-content/en/module/databases/ubuntu-setup/index.md
index e934a837b..41896cfdb 100644
--- a/common-content/en/module/databases/ubuntu-setup/index.md
+++ b/common-content/en/module/databases/ubuntu-setup/index.md
@@ -3,7 +3,7 @@ title = 'Ubuntu setup'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '🐧'
 [objectives]
     1='Set up PostgresQL on an Ubuntu OS'
 [build]
diff --git a/common-content/en/module/databases/updating-rows/index.md b/common-content/en/module/databases/updating-rows/index.md
index 7ea4c66de..f51332c2c 100644
--- a/common-content/en/module/databases/updating-rows/index.md
+++ b/common-content/en/module/databases/updating-rows/index.md
@@ -3,7 +3,7 @@ title = 'Inserting, Updating and Deleting Rows'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '📩'
 [objectives]
     1="Insert, Update and Delete rows in a pre-existing table using INSERT, UPDATE and DELETE"
 [build]
diff --git a/common-content/en/module/databases/using-aggregate-functions/index.md b/common-content/en/module/databases/using-aggregate-functions/index.md
index e95e264a1..fc48983e8 100644
--- a/common-content/en/module/databases/using-aggregate-functions/index.md
+++ b/common-content/en/module/databases/using-aggregate-functions/index.md
@@ -3,7 +3,7 @@ title = 'Using Aggregate Functions'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '🥪'
 [objectives]
     1='Aggregate data over multiple rows and use aggregate values to restrict the results'
 [build]
diff --git a/common-content/en/module/fundamentals/blockers/index.md b/common-content/en/module/fundamentals/blockers/index.md
index e88f64595..108bfee51 100644
--- a/common-content/en/module/fundamentals/blockers/index.md
+++ b/common-content/en/module/fundamentals/blockers/index.md
@@ -3,7 +3,7 @@ title = 'Sharing Our Blockers'
 time = 45
 facilitation = false
 vocabulary=["Blockers"]
-emoji= '🧩'
+emoji= '🚧'
 [objectives]
 1='Identify blockers'
 2='Share blockers on a Jamboard or sticky notes'
diff --git a/common-content/en/module/fundamentals/github/index.md b/common-content/en/module/fundamentals/github/index.md
index 7e13910ae..6bdad0d44 100644
--- a/common-content/en/module/fundamentals/github/index.md
+++ b/common-content/en/module/fundamentals/github/index.md
@@ -3,7 +3,7 @@ title = 'What is GitHub'
 
 time = 25
 facilitation = false
-emoji= '🧩'
+emoji= '🐙'
 [objectives]
 1='Set up a GitHub account'
 [build]
diff --git a/common-content/en/module/fundamentals/goals/index.md b/common-content/en/module/fundamentals/goals/index.md
index 10cf06db0..680c8d7a9 100644
--- a/common-content/en/module/fundamentals/goals/index.md
+++ b/common-content/en/module/fundamentals/goals/index.md
@@ -1,5 +1,6 @@
 +++
 title="Understanding Fundamentals"
+emoji="🎯"
 facilitation=false
 [build]
   render = 'never'
diff --git a/common-content/en/module/fundamentals/mvp/index.md b/common-content/en/module/fundamentals/mvp/index.md
index d816b3f2b..3b88f6725 100644
--- a/common-content/en/module/fundamentals/mvp/index.md
+++ b/common-content/en/module/fundamentals/mvp/index.md
@@ -4,7 +4,7 @@ title = 'MVP'
 time = 30
 facilitation = false
 vocabulary=["MVP"]
-emoji= '🧩'
+emoji= '🚀'
 [objectives]
 1='Identify described requirements'
 2='Identify extra requirements from your own experience'
diff --git a/common-content/en/module/fundamentals/next-steps/index.md b/common-content/en/module/fundamentals/next-steps/index.md
index 065de0a97..ecf0eeeae 100644
--- a/common-content/en/module/fundamentals/next-steps/index.md
+++ b/common-content/en/module/fundamentals/next-steps/index.md
@@ -1,8 +1,8 @@
 +++
-title = 'Next steps 👣'
+title = 'Next steps'
 time="30"
 facilitation = false
-emoji= '🧩'
+emoji= '👣'
 [objectives]
     1='Figure out what we need to do next in the course'
     2='Locate the setup and prep view on the curriculum'
diff --git a/common-content/en/module/fundamentals/overcoming-blockers/index.md b/common-content/en/module/fundamentals/overcoming-blockers/index.md
index 3be55f086..08ac0011c 100644
--- a/common-content/en/module/fundamentals/overcoming-blockers/index.md
+++ b/common-content/en/module/fundamentals/overcoming-blockers/index.md
@@ -1,5 +1,6 @@
 +++
 title="Overcoming Blockers"
+emoji="🚧"
 time=20
 facilitation=false
 [build]
diff --git a/common-content/en/module/fundamentals/pairing/index.md b/common-content/en/module/fundamentals/pairing/index.md
index bd5c1a35a..d002c5daf 100644
--- a/common-content/en/module/fundamentals/pairing/index.md
+++ b/common-content/en/module/fundamentals/pairing/index.md
@@ -4,7 +4,7 @@ title = 'Pairing'
 time = 30
 facilitation = true
 vocabulary=["Pair Programming"]
-emoji= '🧩'
+emoji= '👯‍♀️'
 [objectives]
 1='Identify described requirements'
     2='Identify extra requirements from your own experience'
diff --git a/common-content/en/module/fundamentals/ship-it-delivery/index.md b/common-content/en/module/fundamentals/ship-it-delivery/index.md
index 46fe680f6..b593ad6e5 100644
--- a/common-content/en/module/fundamentals/ship-it-delivery/index.md
+++ b/common-content/en/module/fundamentals/ship-it-delivery/index.md
@@ -3,7 +3,7 @@ title = 'Ship It'
 
 time = 170
 facilitation = false
-emoji= '🧩'
+emoji= '🚢'
 [objectives]
 1='Export your Codepen to zip'
 2='Upload your folder to GitHub'
diff --git a/common-content/en/module/fundamentals/ship-it-iteration/index.md b/common-content/en/module/fundamentals/ship-it-iteration/index.md
index bb876e54a..6b8a09f13 100644
--- a/common-content/en/module/fundamentals/ship-it-iteration/index.md
+++ b/common-content/en/module/fundamentals/ship-it-iteration/index.md
@@ -3,7 +3,7 @@ title = 'Ship It'
 
 time = 60
 facilitation = false
-emoji= '🧩'
+emoji= '🚢'
 [objectives]
 1='Export JavaScript written in CYF Blocks into a website'
 2='Update an already-deployed website with new features'
diff --git a/common-content/en/module/fundamentals/ship-it-requirements/index.md b/common-content/en/module/fundamentals/ship-it-requirements/index.md
index 94452f1d6..e515c626b 100644
--- a/common-content/en/module/fundamentals/ship-it-requirements/index.md
+++ b/common-content/en/module/fundamentals/ship-it-requirements/index.md
@@ -3,7 +3,7 @@ title = 'Ship It'
 
 time = 90
 facilitation = false
-emoji= '🧩'
+emoji= '🚢'
 [objectives]
 1='Export your Codepen to zip'
 2='Upload your folder to GitHub'
diff --git a/common-content/en/module/fundamentals/using-the-curriculum/index.md b/common-content/en/module/fundamentals/using-the-curriculum/index.md
index 8a6321438..f6e1e7ce7 100644
--- a/common-content/en/module/fundamentals/using-the-curriculum/index.md
+++ b/common-content/en/module/fundamentals/using-the-curriculum/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🗺️ Using the curriculum'
+title = 'Using the curriculum'
 
 time="50"
 facilitation = true
-emoji= '🧩'
+emoji= '🗺️'
 [objectives]
    1="Describe our mission"
    2="Identify the key elements of our educational philosophy"
diff --git a/common-content/en/module/fundamentals/wrap-up/index.md b/common-content/en/module/fundamentals/wrap-up/index.md
index 2c32057f7..d508d901b 100644
--- a/common-content/en/module/fundamentals/wrap-up/index.md
+++ b/common-content/en/module/fundamentals/wrap-up/index.md
@@ -4,7 +4,7 @@ title = 'Wrap Up'
 time = 60
 facilitation = false
 vocabulary=["Requirements", "User Stories"]
-emoji= '🧩'
+emoji= '🎉'
 [objectives]
 1='Identify described requirements'
     2='Identify extra requirements from your own experience'
diff --git a/common-content/en/module/how-our-curriculum-works/background/index.md b/common-content/en/module/how-our-curriculum-works/background/index.md
index 597d8c18c..f7e76748b 100644
--- a/common-content/en/module/how-our-curriculum-works/background/index.md
+++ b/common-content/en/module/how-our-curriculum-works/background/index.md
@@ -4,7 +4,7 @@ title = 'Background'
 time = 20
 facilitation = false
 vocabulary=["Blockers"]
-emoji= '🧩'
+emoji= '🌍'
 [objectives]
 1='Summarise the background in which CodeYourFuture was founded'
 2='Describe some of the challenges facing displaced people during the refugee crisis of 2015'
diff --git a/common-content/en/module/how-our-curriculum-works/code-review/index.md b/common-content/en/module/how-our-curriculum-works/code-review/index.md
index c10e50264..a4baa0209 100644
--- a/common-content/en/module/how-our-curriculum-works/code-review/index.md
+++ b/common-content/en/module/how-our-curriculum-works/code-review/index.md
@@ -1,6 +1,6 @@
 +++
 title="Code review"
-emoji="📝"
+emoji="🔍"
 time= 15
 [objectives]
     1="Explain the value of code review"
diff --git a/common-content/en/module/how-our-curriculum-works/codewars/index.md b/common-content/en/module/how-our-curriculum-works/codewars/index.md
index 8e86576c3..8c504ab55 100644
--- a/common-content/en/module/how-our-curriculum-works/codewars/index.md
+++ b/common-content/en/module/how-our-curriculum-works/codewars/index.md
@@ -1,6 +1,6 @@
 +++
 title="Codewars"
-emoji="👾"
+emoji="🥋"
 time= 10
 [objectives]
     1="Define Codewars"
diff --git a/common-content/en/module/how-our-curriculum-works/curriculum/index.md b/common-content/en/module/how-our-curriculum-works/curriculum/index.md
index f046e134f..4f07abcd4 100644
--- a/common-content/en/module/how-our-curriculum-works/curriculum/index.md
+++ b/common-content/en/module/how-our-curriculum-works/curriculum/index.md
@@ -1,6 +1,5 @@
 +++
 title = 'Curriculum'
-
 time = 15
 facilitation = false
 vocabulary=["Blockers"]
diff --git a/common-content/en/module/how-our-curriculum-works/welcome/index.md b/common-content/en/module/how-our-curriculum-works/welcome/index.md
index f2cddc0ed..878b42dcc 100644
--- a/common-content/en/module/how-our-curriculum-works/welcome/index.md
+++ b/common-content/en/module/how-our-curriculum-works/welcome/index.md
@@ -3,7 +3,7 @@ title = 'Welcome'
 
 time = 5
 facilitation = false
-emoji= '🎉'
+emoji= '👋'
 [objectives]
 1='Welcome new members of our community to the module'
 [build]
diff --git a/common-content/en/module/html-css/recap-html-css/index.md b/common-content/en/module/html-css/recap-html-css/index.md
index 7bdac27d5..fc717ce7a 100644
--- a/common-content/en/module/html-css/recap-html-css/index.md
+++ b/common-content/en/module/html-css/recap-html-css/index.md
@@ -3,7 +3,7 @@ title = 'Recap HTML and CSS'
 
 time = 40
 facilitation = false
-emoji= '🧩'
+emoji= '🔁'
 [objectives]
     1='Name 3 HTML tags'
     2='Define semantic HTML'
diff --git a/common-content/en/module/html-css/what-are-forms/index.md b/common-content/en/module/html-css/what-are-forms/index.md
index c81158e39..86ea48b1d 100644
--- a/common-content/en/module/html-css/what-are-forms/index.md
+++ b/common-content/en/module/html-css/what-are-forms/index.md
@@ -3,7 +3,7 @@ title = 'What are forms?'
 
 time = 60
 facilitation = false
-emoji= '🧩'
+emoji= '🔣'
 hide_from_overview = true
 [objectives]
     1='Define form, field, and input'
diff --git a/common-content/en/module/html-css/what-is-css/index.md b/common-content/en/module/html-css/what-is-css/index.md
index a0eaae44b..e70651e7c 100644
--- a/common-content/en/module/html-css/what-is-css/index.md
+++ b/common-content/en/module/html-css/what-is-css/index.md
@@ -4,7 +4,7 @@ title = 'What Is CSS'
 time = 60
 facilitation = false
 vocabulary=['selector', 'property', 'value', 'cascade', 'specificity', 'declarative', 'precedence', 'render', 'block', 'inline']
-emoji= '🧩'
+emoji= '🎨'
 [objectives]
     1='Define the terms: selector, property, value, cascade, specificity, declarative, precedence, render, block, and inline'
 [build]
diff --git a/common-content/en/module/induction/accounts/index.md b/common-content/en/module/induction/accounts/index.md
index c319e3485..4a2ee45fd 100644
--- a/common-content/en/module/induction/accounts/index.md
+++ b/common-content/en/module/induction/accounts/index.md
@@ -1,5 +1,6 @@
 +++
 title="Professional Accounts"
+emoji="🔐"
 time=45
 objectives=["Create a professional Google account", "Download and install the apps you will need to complete the course"]
 hide_from_overview=true
diff --git a/common-content/en/module/induction/check-github/index.md b/common-content/en/module/induction/check-github/index.md
index 43a5e2040..659fcf501 100644
--- a/common-content/en/module/induction/check-github/index.md
+++ b/common-content/en/module/induction/check-github/index.md
@@ -4,7 +4,7 @@ title = 'Setting up Coursework planner'
 time = 15
 facilitation = false
 vocabulary=[]
-emoji= '📋'
+emoji= '🎢'
 [objectives]
 1='Double check Github account is set up'
 2='Double check planner is set up'
diff --git a/common-content/en/module/induction/cyf-folder/index.md b/common-content/en/module/induction/cyf-folder/index.md
index 51feff60c..a3241f1f8 100644
--- a/common-content/en/module/induction/cyf-folder/index.md
+++ b/common-content/en/module/induction/cyf-folder/index.md
@@ -3,7 +3,7 @@ title = 'Create a work folder'
 time = 20
 facilitation = false
 vocabulary=[]
-emoji= '🧰'
+emoji= '📂'
 [objectives]
 1='Navigate and manipulate the file system using a terminal'
 2='Create a named directory to store your work over the course'
diff --git a/common-content/en/module/induction/dot-dev/index.md b/common-content/en/module/induction/dot-dev/index.md
index 2b878ed64..71a31058f 100644
--- a/common-content/en/module/induction/dot-dev/index.md
+++ b/common-content/en/module/induction/dot-dev/index.md
@@ -3,7 +3,7 @@ title = 'GitHub.dev'
 description = 'Completing coursework on a library computer'
 time = 20
 facilitation = false
-emoji= '🧰'
+emoji= '📚'
 [objectives]
 1='Access the dotdev environment on a library computer if you do not have your own'
 [build]
diff --git a/common-content/en/module/induction/github-poets/index.md b/common-content/en/module/induction/github-poets/index.md
index 5cd23b166..48e62f6c5 100644
--- a/common-content/en/module/induction/github-poets/index.md
+++ b/common-content/en/module/induction/github-poets/index.md
@@ -1,13 +1,9 @@
 +++
 title = 'Git and Github for poets'
-
 time = 15
-facilitation = false
-vocabulary=[]
 emoji= '📖 '
 [tasks]
-1='Double check Github account is setup'
-2='Double check Course planner is setup'
+1='Bookmark GitHub training videos'
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/induction/github/index.md b/common-content/en/module/induction/github/index.md
index dac4c7e7e..923b425f6 100644
--- a/common-content/en/module/induction/github/index.md
+++ b/common-content/en/module/induction/github/index.md
@@ -4,9 +4,9 @@ title = 'Check your Planner'
 time = 5
 facilitation = false
 vocabulary=[]
-emoji= '🧩'
-[objectives]
-1='Double check Git is installed on your local machine'
+emoji= '✅'
+[tasks]
+1='Double check you have set up a planner'
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/induction/handshake/index.md b/common-content/en/module/induction/handshake/index.md
index 3f0214cec..9fba2eb63 100644
--- a/common-content/en/module/induction/handshake/index.md
+++ b/common-content/en/module/induction/handshake/index.md
@@ -1,12 +1,11 @@
 +++
 title = 'Handshake'
-
 time = 15
 facilitation = false
 emoji= '🫱🏽‍🫲🏿'
 [objectives]
-    1='Transfer and bookmark any key google sheets from Fundamentals cohort channel in the SDC cohort channel'
-    2='Double check any key information is preserved in the transition from Fundamentals to SDC'
+    1='Transfer and bookmark any key google sheets from previous cohort channel to current cohort channel'
+    2='Double check any key information is preserved in the transition from the last course to this course'
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/induction/working-locally/index.md b/common-content/en/module/induction/working-locally/index.md
index fa7e9d742..c8b849277 100644
--- a/common-content/en/module/induction/working-locally/index.md
+++ b/common-content/en/module/induction/working-locally/index.md
@@ -3,7 +3,7 @@ title = 'Working locally'
 
 time ="20"
 facilitation = false
-emoji= '💻'
+emoji= '🏠'
 [objectives]
     1='Clone a remote repository from GitHub into a local folder'
     2="Define the terms 'remote' and 'local' in the context of GitHub"
diff --git a/common-content/en/module/js1/anonymous-functions/index.md b/common-content/en/module/js1/anonymous-functions/index.md
index 961535c9a..60ee5871e 100644
--- a/common-content/en/module/js1/anonymous-functions/index.md
+++ b/common-content/en/module/js1/anonymous-functions/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🏷️ Anonymous functions'
+title = 'Anonymous functions'
 
 time = 10
 facilitation = false
diff --git a/common-content/en/module/js1/api/index.md b/common-content/en/module/js1/api/index.md
index b955cb6bf..ffa8549b2 100644
--- a/common-content/en/module/js1/api/index.md
+++ b/common-content/en/module/js1/api/index.md
@@ -1,9 +1,9 @@
 +++
-title = "🎛️ Jest's Application Programming Interface"
+title = "Jest's Application Programming Interface"
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🎛️'
 [objectives]
     1='Explain why we use APIs in programming'
     2='Identify some commonly used APIs'
diff --git a/common-content/en/module/js1/arrow-functions/index.md b/common-content/en/module/js1/arrow-functions/index.md
index 61118e740..aebdcbb6e 100644
--- a/common-content/en/module/js1/arrow-functions/index.md
+++ b/common-content/en/module/js1/arrow-functions/index.md
@@ -1,5 +1,5 @@
 +++
-title = '➡️ Arrow functions'
+title = 'Arrow functions'
 
 time = 5
 facilitation = false
@@ -35,7 +35,7 @@ function (decimalNumber) {
 // If we do this, we need an arrow between our parameters and the function body.
 (decimalNumber) => {
   return `${decimalNumber * 100}%`;
-}
+};
 ```
 
 ```js
diff --git a/common-content/en/module/js1/assembly/index.md b/common-content/en/module/js1/assembly/index.md
index 54ee124ff..2e11cc519 100644
--- a/common-content/en/module/js1/assembly/index.md
+++ b/common-content/en/module/js1/assembly/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🏗️ Assembling the parts'
+title = 'Assembling the parts'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🏗️'
 [objectives]
     1='Explain how different concepts are combined to solve a goal'
 [build]
diff --git a/common-content/en/module/js1/assertions/index.md b/common-content/en/module/js1/assertions/index.md
index dea160cef..2dcc1fe63 100644
--- a/common-content/en/module/js1/assertions/index.md
+++ b/common-content/en/module/js1/assertions/index.md
@@ -1,9 +1,9 @@
 +++
-title = '✏️ Writing an assertion'
+title = 'Writing an assertion'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '✏️'
 [objectives]
 1='Describe the difference between console.log and console.assert'
 2='Write an assertion to check for some behaviour of a given function'
diff --git a/common-content/en/module/js1/cases/index.md b/common-content/en/module/js1/cases/index.md
index 9226ee24e..13c4cfe1b 100644
--- a/common-content/en/module/js1/cases/index.md
+++ b/common-content/en/module/js1/cases/index.md
@@ -1,9 +1,9 @@
 +++
-title = '💼 First test case'
+title = 'First test case'
 
 time = 40
 facilitation = false
-emoji= '🧩'
+emoji= '💼'
 [objectives]
     1='Outline the effect of running npm test'
     2='Interpret documentation to determine how part of a third-party API behaves'
@@ -30,7 +30,7 @@ We can use [documentation](https://jestjs.io/docs/getting-started) to work out h
 `get-ordinal-number.test.js`:
 
 ```js
-test("converts 1 to an ordinal number", function() {});
+test("converts 1 to an ordinal number", function () {});
 ```
 
 Let's break down this syntax.
@@ -53,7 +53,7 @@ We need to write an **assertion** inside the body of `function() {}` inside `get
 `get-ordinal-number.test.js`:
 
 ```js
-test("converts 1 to an ordinal number", function() {});
+test("converts 1 to an ordinal number", function () {});
 ```
 
 {{<note type="tip" title="Recall">}}
@@ -78,7 +78,7 @@ A matcher is a function we use to compare values in Jest.
 So the whole test looks like this:
 
 ```js
-test("converts 1 to an ordinal number", function() {
+test("converts 1 to an ordinal number", function () {
   expect(getOrdinalNumber(1)).toEqual("1st");
 });
 ```
diff --git a/common-content/en/module/js1/check-unix-os/index.md b/common-content/en/module/js1/check-unix-os/index.md
index c487568de..bdce8b393 100644
--- a/common-content/en/module/js1/check-unix-os/index.md
+++ b/common-content/en/module/js1/check-unix-os/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧰 Install a UNIX based operating system'
+title = 'Install a UNIX based operating system'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🧰'
 [objectives]
     1='Check you have a Unix based operating system'
     2='If required, setup a Unix based operating system'
diff --git a/common-content/en/module/js1/clocks/index.md b/common-content/en/module/js1/clocks/index.md
index 92abb0375..50a7de479 100644
--- a/common-content/en/module/js1/clocks/index.md
+++ b/common-content/en/module/js1/clocks/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🕛 12 vs 24 hour clock'
+title = '12 vs 24 hour clock'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🕛'
 hide_from_overview = true
 [objectives]
  1='Identify a pattern between a set of inputs and outputs produced by a given function'
diff --git a/common-content/en/module/js1/comparison/index.md b/common-content/en/module/js1/comparison/index.md
index 4ea1d912a..7bc2ff50e 100644
--- a/common-content/en/module/js1/comparison/index.md
+++ b/common-content/en/module/js1/comparison/index.md
@@ -1,9 +1,9 @@
 +++
-title = '⚖️ Comparing current and target output'
+title = 'Comparing current and target output'
 
 time = 40
 facilitation = false
-emoji= '🧩'
+emoji= '⚖️'
 [objectives]
     1='Evaluate an expression that uses a comparison operator'
     2='Explain when to use the === operator in a program'
diff --git a/common-content/en/module/js1/conditionality/index.md b/common-content/en/module/js1/conditionality/index.md
index 31eba7c80..931a6cd1a 100644
--- a/common-content/en/module/js1/conditionality/index.md
+++ b/common-content/en/module/js1/conditionality/index.md
@@ -1,9 +1,9 @@
 +++
-title = '❓ Conditionally executing code'
+title = 'Conditionally executing code'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '❓'
 [objectives]
   1='Construct a flow diagram that describes how to produce an output from a given input'
   2='Explain when it is necessary to use a conditional statement'
diff --git a/common-content/en/module/js1/data/index.md b/common-content/en/module/js1/data/index.md
index d9204f45c..001c949a4 100644
--- a/common-content/en/module/js1/data/index.md
+++ b/common-content/en/module/js1/data/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🗄️ Classifying data'
+title = 'Classifying data'
 
 time = 15
 facilitation = false
@@ -30,7 +30,7 @@ A **data type** is a grouping of data with some particular properties{{</tooltip
 A string is a sequence of characters demarcated by quotes.
 
 ```js
-"Code Your Future"
+"Code Your Future";
 ```
 
 ### 🧮 Creating expressions
@@ -40,7 +40,7 @@ Think of the numbers `10` and `32`. We could ask questions about these numbers,
 Another way to say this is _what do 10 and 32 add up to?_ In English we can say this in many ways, but in JavaScript we can say this using numbers and an operator. Just like in mathematics, “the sum of 10 and 32” can be written as `10 + 32`:
 
 ```js
-10 + 32
+10 + 32;
 ```
 
 In JavaScript, `+` is an {{<tooltip title="operator">}} An **operator** represents an operation, or act. {{</tooltip>}}. It's a symbol. In this example, `+` represents the operation “make the sum of the numbers”. It symbolises addition.
diff --git a/common-content/en/module/js1/declarations-statements/index.md b/common-content/en/module/js1/declarations-statements/index.md
index ce2a5471e..71a038094 100644
--- a/common-content/en/module/js1/declarations-statements/index.md
+++ b/common-content/en/module/js1/declarations-statements/index.md
@@ -1,9 +1,9 @@
 +++
-title = '💬 Declarations and statements'
+title = 'Declarations and statements'
 
 time = 10
 facilitation = false
-emoji= '🗄️'
+emoji= '💬'
 [objectives]
     1='Define a declaration'
     2='Define a statement'
diff --git a/common-content/en/module/js1/declaring-functions/index.md b/common-content/en/module/js1/declaring-functions/index.md
index a976b4f77..9201f3ca8 100644
--- a/common-content/en/module/js1/declaring-functions/index.md
+++ b/common-content/en/module/js1/declaring-functions/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪄 Declaring functions'
+title = 'Declaring functions'
 
 time = 20
 facilitation = false
-emoji= '🗄️'
+emoji= '🪄'
 [objectives]
     1='Label and describe the syntactic features of a function declaration'
 [build]
diff --git a/common-content/en/module/js1/define-computer/index.md b/common-content/en/module/js1/define-computer/index.md
index a7b6eccd8..353ad89e0 100644
--- a/common-content/en/module/js1/define-computer/index.md
+++ b/common-content/en/module/js1/define-computer/index.md
@@ -3,7 +3,7 @@ title = 'Interacting with computers'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🤝'
 [objectives]
  1='Define a computer'
 [build]
diff --git a/common-content/en/module/js1/errors/index.md b/common-content/en/module/js1/errors/index.md
index 3798e7264..14a7df821 100644
--- a/common-content/en/module/js1/errors/index.md
+++ b/common-content/en/module/js1/errors/index.md
@@ -1,5 +1,5 @@
 +++
-title = '❌ Errors'
+title = 'Errors'
 
 time = 20
 facilitation = false
diff --git a/common-content/en/module/js1/feedback/index.md b/common-content/en/module/js1/feedback/index.md
index d959b4158..4137133ed 100644
--- a/common-content/en/module/js1/feedback/index.md
+++ b/common-content/en/module/js1/feedback/index.md
@@ -1,9 +1,9 @@
 +++
-title = '✅ ❌ Interpreting feedback'
+title = 'Interpreting feedback'
 
 time = 25
 facilitation = false
-emoji= '🗄️'
+emoji= '✅❌'
 [objectives]
     1='Identify current output and target output in test feedback'
     2='Determine the line an error occurred from some test feedback'
@@ -101,7 +101,10 @@ Without Jest, this assertion would probably have looked more like:
 const input = 1;
 const targetOutput = "1st";
 const currentOutput = getOrdinalNumber(input);
-console.assert(targetOutput === currentOutput, `Expected ${targetOutput} but got ${currentOutput}`);
+console.assert(
+  targetOutput === currentOutput,
+  `Expected ${targetOutput} but got ${currentOutput}`
+);
 ```
 
 Because Jest makes a useful error message for us telling us what the target and current outputs are, we could write this all in one line. We didn't need a variable so we could pass `"1st"` both to `getOrdinalNumber` and into the message.
@@ -120,7 +123,7 @@ function getOrdinalNumber() {
   return "1st";
 }
 
-test("converts 1 to an ordinal number", function() {
+test("converts 1 to an ordinal number", function () {
   expect(getOrdinalNumber(1)).toEqual("1st");
 });
 ```
diff --git a/common-content/en/module/js1/framework/index.md b/common-content/en/module/js1/framework/index.md
index be0153609..d46f62b48 100644
--- a/common-content/en/module/js1/framework/index.md
+++ b/common-content/en/module/js1/framework/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🖼️ Testing frameworks'
+title = 'Testing frameworks'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🖼️'
 [objectives]
     1='Explain why we need to use testing frameworks'
 [build]
diff --git a/common-content/en/module/js1/functions-workshop/index.md b/common-content/en/module/js1/functions-workshop/index.md
index 451874716..db3dbadbc 100644
--- a/common-content/en/module/js1/functions-workshop/index.md
+++ b/common-content/en/module/js1/functions-workshop/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📼 Solving Problems with Functions'
+title = 'Solving Problems with Functions'
 
 time = 60
 facilitation = false
-emoji= '🗄️'
+emoji= '📼'
 [objectives]
     1='Practice solving problems with functions'
 [build]
@@ -24,28 +24,28 @@ You can use the code samples below as a starting point.
 // Write a function that will calculate the area of a rectangle
 //   given it's width and height
 
-let width = 3
-let height = 4
+let width = 3;
+let height = 4;
 
 function calculateArea() {
-    const area = width * height
+  const area = width * height;
 }
 
-console.log(area)
+console.log(area);
 ```
 
 ### Exercise 2
 
 ```js
 function capitaliseFirstLetter(name) {
-    console.log(name[0].toUpperCase() + name.substring(1))
+  console.log(name[0].toUpperCase() + name.substring(1));
 }
 
 function createGreeting(name) {
-    const result = capitaliseFirstLetter(name)
-    return `Welcome ${result}`
+  const result = capitaliseFirstLetter(name);
+  return `Welcome ${result}`;
 }
 
-const greeting = createGreeting('barath')
-console.log(greeting)
+const greeting = createGreeting("barath");
+console.log(greeting);
 ```
diff --git a/common-content/en/module/js1/functions/index.md b/common-content/en/module/js1/functions/index.md
index 46496df28..d2117f6eb 100644
--- a/common-content/en/module/js1/functions/index.md
+++ b/common-content/en/module/js1/functions/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪄 Functions'
+title = 'Functions'
 
 time = 20
 facilitation = false
-emoji= '🗄️'
+emoji= '🪄'
 [objectives]
     1='Define a function in programming'
     2='Evaluate a function expression'
diff --git a/common-content/en/module/js1/generalise/index.md b/common-content/en/module/js1/generalise/index.md
index 0c7e30df1..045cd0a4b 100644
--- a/common-content/en/module/js1/generalise/index.md
+++ b/common-content/en/module/js1/generalise/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🗄️ Generalising further'
+title = 'Generalising further'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🗄️'
 [objectives]
     1='Extend an implementation based on more assertions'
 [build]
@@ -33,7 +33,7 @@ function getOrdinalNumber() {
   return "1st";
 }
 
-test("works for any number ending in 1", function() {
+test("works for any number ending in 1", function () {
   expect(getOrdinalNumber(1)).toEqual("1st");
   expect(getOrdinalNumber(11)).toEqual("11th");
   expect(getOrdinalNumber(21)).toEqual("21st");
diff --git a/common-content/en/module/js1/identifying-missing-tests/index.md b/common-content/en/module/js1/identifying-missing-tests/index.md
index 244617d56..a399ee665 100644
--- a/common-content/en/module/js1/identifying-missing-tests/index.md
+++ b/common-content/en/module/js1/identifying-missing-tests/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🔬 Identifying missing tests'
+title = 'Identifying missing tests'
 
 time = 30
 facilitation = false
@@ -51,7 +51,7 @@ Some examples are: the minimum value, the maximum value, and the boundary betwee
 Some example edge cases for this problem are:
 `00:00`
 : The minimum time, which is `12:00 am` in 12 hour clock.  
-  This is also the only hour that is _bigger_ in 12 hour clock than 24 hour clock.
+ This is also the only hour that is _bigger_ in 12 hour clock than 24 hour clock.
 
 `24:00`
 : The maximum time.
diff --git a/common-content/en/module/js1/improving/index.md b/common-content/en/module/js1/improving/index.md
index 6a883d86f..f43b0aee7 100644
--- a/common-content/en/module/js1/improving/index.md
+++ b/common-content/en/module/js1/improving/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧹 Improving the code'
+title = 'Improving the code'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🧹'
 [objectives]
 1='Explain why refactoring is necessary in the production of software'
 2='Suggest several appropriate ways to refactor a given piece of code'
diff --git a/common-content/en/module/js1/install-node/index.md b/common-content/en/module/js1/install-node/index.md
index fc6d53fdb..c224bb6e8 100644
--- a/common-content/en/module/js1/install-node/index.md
+++ b/common-content/en/module/js1/install-node/index.md
@@ -1,6 +1,6 @@
 +++
-title = "🧰 Install Node with nvm"
- 
+title = "Install Node with nvm"
+emoji = "🧰"
 time = 20 
 facilitation = false
 [objectives] 
diff --git a/common-content/en/module/js1/installing/index.md b/common-content/en/module/js1/installing/index.md
index 7714d3630..1ada0f652 100644
--- a/common-content/en/module/js1/installing/index.md
+++ b/common-content/en/module/js1/installing/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🃏 Installing Jest'
+title = 'Installing Jest'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🃏'
 [objectives]
     1='Outline the effects of running an installation command, e.g. npm install'
     2='Install a dependency with npm'
diff --git a/common-content/en/module/js1/interface/index.md b/common-content/en/module/js1/interface/index.md
index 269f5a568..3d796a4ee 100644
--- a/common-content/en/module/js1/interface/index.md
+++ b/common-content/en/module/js1/interface/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🕹️ Using an interface'
+title = 'Using an interface'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🕹️'
 [objectives]
     1='Categorise different interfaces'
 [build]
diff --git a/common-content/en/module/js1/interpreting-errors/index.md b/common-content/en/module/js1/interpreting-errors/index.md
index a70d3e922..1bc3c7bd7 100644
--- a/common-content/en/module/js1/interpreting-errors/index.md
+++ b/common-content/en/module/js1/interpreting-errors/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🔎 Interpreting errors'
+title = 'Interpreting errors'
 
 time = 20
 facilitation = false
diff --git a/common-content/en/module/js1/interpreting-this-error/index.md b/common-content/en/module/js1/interpreting-this-error/index.md
index 2118439f5..ddcac4c22 100644
--- a/common-content/en/module/js1/interpreting-this-error/index.md
+++ b/common-content/en/module/js1/interpreting-this-error/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🧠 Interpreting this error'
+title = 'Interpreting this error'
 
 time = 20
 facilitation = false
@@ -88,11 +88,11 @@ Make sure you _understand_ each word. Make sure you could explain the word to so
 Expand for example definitions - only expand this after you have written yours down. Compare your answers with these.
 </summary>
 
-* **SyntaxError** - If we Google "JavaScript SyntaxError", [MDN tells us](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SyntaxError) this is "an error when trying to interpret syntactically invalid code". So - we wrote some code which isn't allowed.
-* **Identifier** - If we Google "JavaScript Identifier", [MDN tells us](https://developer.mozilla.org/en-US/docs/Glossary/Identifier): this is "a sequence of characters in the code that identifies a variable, function, or property". On line 12, the identifier is the variable name: `currentOutput`.
-* **currentOutput** - This is the variable name we used in our code. This is the **identifier** that the error is about.
-* **has**, **already**, and **been** are all standard English words with no special meaning.
-* **declared** - We learnt about this already in this course - a **declaration** is where we make a new name (e.g. a new variable) in JavaScript.
+- **SyntaxError** - If we Google "JavaScript SyntaxError", [MDN tells us](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SyntaxError) this is "an error when trying to interpret syntactically invalid code". So - we wrote some code which isn't allowed.
+- **Identifier** - If we Google "JavaScript Identifier", [MDN tells us](https://developer.mozilla.org/en-US/docs/Glossary/Identifier): this is "a sequence of characters in the code that identifies a variable, function, or property". On line 12, the identifier is the variable name: `currentOutput`.
+- **currentOutput** - This is the variable name we used in our code. This is the **identifier** that the error is about.
+- **has**, **already**, and **been** are all standard English words with no special meaning.
+- **declared** - We learnt about this already in this course - a **declaration** is where we make a new name (e.g. a new variable) in JavaScript.
 
 Reading that back, we can rephrase this error message:
 
diff --git a/common-content/en/module/js1/logging/index.md b/common-content/en/module/js1/logging/index.md
index febca1667..b3285dd33 100644
--- a/common-content/en/module/js1/logging/index.md
+++ b/common-content/en/module/js1/logging/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🖨️ Logging'
+title = 'Logging'
 
 time = 10
 facilitation = false
-emoji= '🗄️'
+emoji= '🖨️'
 [objectives]
     1='Use console.log to print a value'
 [build]
diff --git a/common-content/en/module/js1/ordinal/index.md b/common-content/en/module/js1/ordinal/index.md
index b7c699403..c979a7654 100644
--- a/common-content/en/module/js1/ordinal/index.md
+++ b/common-content/en/module/js1/ordinal/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧮 Ordinal numbers'
+title = 'Ordinal numbers'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🧮'
 hide_from_overview = true
 [objectives]
     1='Convert positions to ordinal numbers'
diff --git a/common-content/en/module/js1/outliers/index.md b/common-content/en/module/js1/outliers/index.md
index 41d811d5b..cf4898444 100644
--- a/common-content/en/module/js1/outliers/index.md
+++ b/common-content/en/module/js1/outliers/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🗄️ Generalising further'
+title = 'Generalising further'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🗄️'
 [objectives]
     1='Define an outlier'
 [build]
diff --git a/common-content/en/module/js1/packages/index.md b/common-content/en/module/js1/packages/index.md
index 3def74d96..bc9f4c540 100644
--- a/common-content/en/module/js1/packages/index.md
+++ b/common-content/en/module/js1/packages/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📦 Using packages'
+title = 'Using packages'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '📦'
 [objectives]
     1='Define a dependency'
     2='Define a package'
diff --git a/common-content/en/module/js1/parameters/index.md b/common-content/en/module/js1/parameters/index.md
index bbd9753ce..fbc5808a2 100644
--- a/common-content/en/module/js1/parameters/index.md
+++ b/common-content/en/module/js1/parameters/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🏷️ Parameterising a function'
+title = 'Parameterising a function'
 
 time = 40
 facilitation = false
-emoji= '🗄️'
+emoji= '🏷️'
 [objectives]
     1='Define a parameter'
     2='Identify the value assigned to a parameter when a function is invoked'
diff --git a/common-content/en/module/js1/percentages/index.md b/common-content/en/module/js1/percentages/index.md
index a03f272bd..10b23d011 100644
--- a/common-content/en/module/js1/percentages/index.md
+++ b/common-content/en/module/js1/percentages/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧩 Percentages'
+title = 'Percentages'
 
 time = 30
 facilitation = false
-emoji= '🗄️'
+emoji= '🧮'
 [objectives]
     2='Construct simple expressions to represent a calculation'
 [build]
diff --git a/common-content/en/module/js1/playing-computer/index.md b/common-content/en/module/js1/playing-computer/index.md
index c26cfe43b..432022654 100644
--- a/common-content/en/module/js1/playing-computer/index.md
+++ b/common-content/en/module/js1/playing-computer/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🎮 Playing computer'
+title = 'Playing computer'
 
 time = 30
 facilitation = false
-emoji= '🗄️'
+emoji= '🎮'
 [objectives]
     1='Analyse each line in a given program and state what the line does when the program executes'
     2='Differentiate between a function declaration and a function invocation'
diff --git a/common-content/en/module/js1/refactoring-repetition/index.md b/common-content/en/module/js1/refactoring-repetition/index.md
index 2affa2a4d..06c633e94 100644
--- a/common-content/en/module/js1/refactoring-repetition/index.md
+++ b/common-content/en/module/js1/refactoring-repetition/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🧹 Refactoring repetition'
+title = 'Refactoring repetition'
 
 time = 30
 facilitation = false
@@ -50,7 +50,7 @@ There are a few reasons this isn't ideal.
 1. It's not clear what this value represents. You can read it and work it out, but that takes some time.
 2. Doing the same thing twice is slower than doing it once.
 3. In the future if we need to change this code's implementation, we would need to change it **twice**.  
-Right now our code assumes the hours in a time are always two digits (like `05:00`). What if we wanted to support single-digit hours, like `5:00`? We would need to make the same change to both lines. It would be easy to change one line and forget the other, which would lead to a bug.
+   Right now our code assumes the hours in a time are always two digits (like `05:00`). What if we wanted to support single-digit hours, like `5:00`? We would need to make the same change to both lines. It would be easy to change one line and forget the other, which would lead to a bug.
 
 ### Refactor
 
diff --git a/common-content/en/module/js1/repl/index.md b/common-content/en/module/js1/repl/index.md
index 4ad4a2d2c..d58ec5053 100644
--- a/common-content/en/module/js1/repl/index.md
+++ b/common-content/en/module/js1/repl/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧾 Evaluating expressions'
+title = 'Evaluating expressions'
 
 time = 15
 facilitation = false
-emoji= '🗄️'
+emoji= '🧾'
 [objectives]
     1='Define the features of the Node REPL'
     2='Evaluate expressions using your mental model of JavaScript'
diff --git a/common-content/en/module/js1/return/index.md b/common-content/en/module/js1/return/index.md
index c6a6b79c3..1e13a43ce 100644
--- a/common-content/en/module/js1/return/index.md
+++ b/common-content/en/module/js1/return/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📤 Returning from a function'
+title = 'Returning from a function'
 
 time = 30
 facilitation = false
-emoji= '🗄️'
+emoji= '📤'
 [objectives]
     1='Identify the return value at a call site given its function declaration'
     2='Log the return value of a function'
diff --git a/common-content/en/module/js1/reuse/index.md b/common-content/en/module/js1/reuse/index.md
index b4619b95b..87e57f3e3 100644
--- a/common-content/en/module/js1/reuse/index.md
+++ b/common-content/en/module/js1/reuse/index.md
@@ -1,9 +1,9 @@
 +++
-title = '♻️ Reusing the function'
+title = 'Reusing the function'
 
 time = 30
 facilitation = false
-emoji= '🗄️'
+emoji= '♻️'
 [objectives]
     1='Evaluate a function expression'
     2='Call a function with an input in REPL'
diff --git a/common-content/en/module/js1/reusing-variable-names/index.md b/common-content/en/module/js1/reusing-variable-names/index.md
index c14a93454..d7e0eafdf 100644
--- a/common-content/en/module/js1/reusing-variable-names/index.md
+++ b/common-content/en/module/js1/reusing-variable-names/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🔄 Reusing variable names'
+title = 'Reusing variable names'
 
 time = 30
 facilitation = false
diff --git a/common-content/en/module/js1/scope/index.md b/common-content/en/module/js1/scope/index.md
index f3f7194c1..95912da97 100644
--- a/common-content/en/module/js1/scope/index.md
+++ b/common-content/en/module/js1/scope/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🔭 Scope'
+title = 'Scope'
 
 time = 20
 facilitation = false
-emoji= '❌'
+emoji= '🔭'
 [objectives]
 1='Define scope'
 2='Explain what happens when a variable is referenced out of scope'
diff --git a/common-content/en/module/js1/scripts/index.md b/common-content/en/module/js1/scripts/index.md
index ab5585599..78203559c 100644
--- a/common-content/en/module/js1/scripts/index.md
+++ b/common-content/en/module/js1/scripts/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📁 Running scripts'
+title = 'Running scripts'
 
 time = 10
 facilitation = false
-emoji= '🗄️'
+emoji= '📁'
 [objectives]
     1='Execute a JavaScript file with Node'
 [build]
diff --git a/common-content/en/module/js1/setup/index.md b/common-content/en/module/js1/setup/index.md
index e36976a7f..c86680320 100644
--- a/common-content/en/module/js1/setup/index.md
+++ b/common-content/en/module/js1/setup/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🎒 Starting a project'
+title = 'Starting a project'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🎒'
 [objectives]
     1='Identify a package.json'
     2='Explain the purpose of a package.json'
diff --git a/common-content/en/module/js1/strategy/index.md b/common-content/en/module/js1/strategy/index.md
index 288def36f..23a0f7c53 100644
--- a/common-content/en/module/js1/strategy/index.md
+++ b/common-content/en/module/js1/strategy/index.md
@@ -1,9 +1,9 @@
 +++
-title = '↙️ ↘️ Making a choice'
+title = 'Making a choice'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '↙️ ↘️'
 hide_from_overview = true
 [objectives]
     1='Propose a strategy for solving a problem'
diff --git a/common-content/en/module/js1/strings/index.md b/common-content/en/module/js1/strings/index.md
index 43139d924..441004c73 100644
--- a/common-content/en/module/js1/strings/index.md
+++ b/common-content/en/module/js1/strings/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧶 Accessing strings'
+title = 'Accessing strings'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🧶'
 [objectives]
  1='Define zero-indexing'
  2= 'Given a short program, determine the return value of a call to slice on a string before execution'
diff --git a/common-content/en/module/js1/sub-goal-2/index.md b/common-content/en/module/js1/sub-goal-2/index.md
index b690fb071..f512f2284 100644
--- a/common-content/en/module/js1/sub-goal-2/index.md
+++ b/common-content/en/module/js1/sub-goal-2/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🏗️ Sub-goal #2'
+title = 'Sub-goal #2'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🏗️'
 hide_from_overview = true
 [objectives]
     1='Explain how different concepts are combined to solve a goal'
diff --git a/common-content/en/module/js1/sub-goal/index.md b/common-content/en/module/js1/sub-goal/index.md
index 970a26180..5390120dd 100644
--- a/common-content/en/module/js1/sub-goal/index.md
+++ b/common-content/en/module/js1/sub-goal/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧠 Forming sub-goals'
+title = 'Forming sub-goals'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🧠'
 [objectives]
  1='Define a sub-goal'
  2='Explain why we use sub-goals'
diff --git a/common-content/en/module/js1/terminal/index.md b/common-content/en/module/js1/terminal/index.md
index 1d0800403..8a5d80691 100644
--- a/common-content/en/module/js1/terminal/index.md
+++ b/common-content/en/module/js1/terminal/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🖥️ Terminal interface'
+title = 'Terminal interface'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🖥️'
 [objectives]
 1='Identify the terminal and its purpose'
 2='Execute commands in the terminal'
diff --git a/common-content/en/module/js1/testing-a-sub-goal/index.md b/common-content/en/module/js1/testing-a-sub-goal/index.md
index f6cab3bab..3ff3af93f 100644
--- a/common-content/en/module/js1/testing-a-sub-goal/index.md
+++ b/common-content/en/module/js1/testing-a-sub-goal/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🔎 Testing a sub-goal'
+title = 'Testing a sub-goal'
 
 time = 15
 facilitation = false
diff --git a/common-content/en/module/js1/testing-workshop/index.md b/common-content/en/module/js1/testing-workshop/index.md
index ee66d8258..a274fbc95 100644
--- a/common-content/en/module/js1/testing-workshop/index.md
+++ b/common-content/en/module/js1/testing-workshop/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📼 Testing Workshop'
+title = 'Testing Workshop'
 
 time = 60
 facilitation = false
-emoji= '🗄️'
+emoji= '📼'
 [objectives]
     1='Practice solving problems while testing'
 [build]
@@ -21,7 +21,7 @@ You can use the code samples below as a starting point.
 ### Exercise 1
 
 ```js
-// Create a function that takes three numbers as parameters 
+// Create a function that takes three numbers as parameters
 //   and returns the largest of the three
 ```
 
diff --git a/common-content/en/module/js1/variables/index.md b/common-content/en/module/js1/variables/index.md
index 4c4de8035..cae5d58d4 100644
--- a/common-content/en/module/js1/variables/index.md
+++ b/common-content/en/module/js1/variables/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🏷️ Saving expressions'
+title = 'Saving expressions'
 
 time = 15
 facilitation = false
-emoji= '🗄️'
+emoji= '🏷️'
 [objectives]
 1='Identify the syntactic features of a variable declaration'
 2='Explain why we use variable declarations'
diff --git a/common-content/en/module/js2/access/index.md b/common-content/en/module/js2/access/index.md
index e7fbc23d4..cde252519 100644
--- a/common-content/en/module/js2/access/index.md
+++ b/common-content/en/module/js2/access/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🚪 Accessing properties'
+title = 'Accessing properties'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🚪'
 [objectives]
     1='Access object property values with dot notation'
     2='Define the term "literal"'
diff --git a/common-content/en/module/js2/arrays-workshop/index.md b/common-content/en/module/js2/arrays-workshop/index.md
index 316be4210..bc765c76f 100644
--- a/common-content/en/module/js2/arrays-workshop/index.md
+++ b/common-content/en/module/js2/arrays-workshop/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📼 Arrays Workshop'
+title = 'Arrays Workshop'
 
 time = 60
 facilitation = false
-emoji= '🗄️'
+emoji= '📼'
 [objectives]
     1='Practice solving problems with arrays'
 [build]
@@ -23,30 +23,29 @@ You can use the code samples below as a starting point.
 ```js
 // Can you fix this code?
 function doubleAllNumbers() {
-    let doubledNumbers
+  let doubledNumbers;
 
-    for(let n of numbers) {
-        doubledNumbers.push(n * 2)
-    }
+  for (let n of numbers) {
+    doubledNumbers.push(n * 2);
+  }
 
-    return doubledNumbers
+  return doubledNumbers;
 }
 
-const myNums = [10, 20, 30]
-doubleAllNumbers(myNums)
-console.log(myNums)
+const myNums = [10, 20, 30];
+doubleAllNumbers(myNums);
+console.log(myNums);
 ```
 
 ### Exercise 2
 
 ```js
-// Write a function which takes an array as a parameter 
+// Write a function which takes an array as a parameter
 //   and swaps the first element with the last element
 
-function swapFirstAndLast(arr) {
-}
+function swapFirstAndLast(arr) {}
 
-const myArray = [5, 2, 3, 4, 1]
-swapFirstAndLast(myArray)
-console.log(myArray) // what output should we expect?
+const myArray = [5, 2, 3, 4, 1];
+swapFirstAndLast(myArray);
+console.log(myArray); // what output should we expect?
 ```
diff --git a/common-content/en/module/js2/arrays/index.md b/common-content/en/module/js2/arrays/index.md
index d7f24c9e4..ef2ebb0e6 100644
--- a/common-content/en/module/js2/arrays/index.md
+++ b/common-content/en/module/js2/arrays/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📜 Arrays'
+title = 'Arrays'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '📜'
 [objectives]
     1='Access items in an array using an index'
     2='Identify the benefits of using an array to store information'
diff --git a/common-content/en/module/js2/assembly/index.md b/common-content/en/module/js2/assembly/index.md
index fed688219..9917f844b 100644
--- a/common-content/en/module/js2/assembly/index.md
+++ b/common-content/en/module/js2/assembly/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧱 Assembling the parts'
+title = 'Assembling the parts'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🧱'
 hide_from_overview = true
 [objectives]
 1='Identify a bug when a function gives an unexpected output'
diff --git a/common-content/en/module/js2/browser/index.md b/common-content/en/module/js2/browser/index.md
index cb8b64399..bb3a33008 100644
--- a/common-content/en/module/js2/browser/index.md
+++ b/common-content/en/module/js2/browser/index.md
@@ -1,9 +1,9 @@
 +++
-title = '💻 User interfaces'
+title = 'User interfaces'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '💻'
 [objectives]
     1='Define static html'
     2='Explain why we interact with user interfaces'
diff --git a/common-content/en/module/js2/calculating/index.md b/common-content/en/module/js2/calculating/index.md
index 0f3674d12..cf27ca012 100644
--- a/common-content/en/module/js2/calculating/index.md
+++ b/common-content/en/module/js2/calculating/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧮 Calculating the remaining characters'
+title = 'Calculating the remaining characters'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🧮'
 hide_from_overview = true
 [objectives]
     1='Access properties representing HTML attributes'
@@ -36,7 +36,7 @@ In the Dev Tools console, if you type `textarea.max` you should see autocomplete
 Most HTML attributes are exposed in the DOM as a property with the same name (but in camelCase). Let's try:
 
 ```js
-console.log(textarea.maxLength)
+console.log(textarea.maxLength);
 ```
 
 Now that we have the character limit (from `textarea.maxLength`), and the number of characters already typed (from `textarea.value.length`):
diff --git a/common-content/en/module/js2/character-limit/index.md b/common-content/en/module/js2/character-limit/index.md
index 7e172be9e..385e05cbb 100644
--- a/common-content/en/module/js2/character-limit/index.md
+++ b/common-content/en/module/js2/character-limit/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🛑 Implenenting a character limit'
+title = 'Implementing a character limit'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🛑'
 [objectives]
     1='Define acceptance criteria for the character limit component'
 [build]
diff --git a/common-content/en/module/js2/check-in/index.md b/common-content/en/module/js2/check-in/index.md
index f230dc086..b5a5a4378 100644
--- a/common-content/en/module/js2/check-in/index.md
+++ b/common-content/en/module/js2/check-in/index.md
@@ -1,6 +1,6 @@
 +++
-title="✏️ Check your progress"
-
+title="Check your progress"
+emoji="✏️"
 time=30
 vocabulary="Backlog"
 [objectives]
diff --git a/common-content/en/module/js2/check-progress/index.md b/common-content/en/module/js2/check-progress/index.md
index f4159fc75..ce85e93b9 100644
--- a/common-content/en/module/js2/check-progress/index.md
+++ b/common-content/en/module/js2/check-progress/index.md
@@ -1,5 +1,5 @@
 +++
-title = '📝 Check progress'
+title = 'Check progress'
 
 time = 15
 facilitation = false
diff --git a/common-content/en/module/js2/demo/index.md b/common-content/en/module/js2/demo/index.md
index 560b4255e..9fa3f95b6 100644
--- a/common-content/en/module/js2/demo/index.md
+++ b/common-content/en/module/js2/demo/index.md
@@ -1,6 +1,6 @@
 +++
-title="▶️ Demo"
-
+title="Demo"
+emoji="📽️"
 time= 60
 vocabulary="Backlog"
 [objectives]
diff --git a/common-content/en/module/js2/dom/index.md b/common-content/en/module/js2/dom/index.md
index 52b45dafa..efd2c7343 100644
--- a/common-content/en/module/js2/dom/index.md
+++ b/common-content/en/module/js2/dom/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🌲 The DOM'
+title = 'The DOM'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🌲'
 [objectives]
     1='Define the Document Object Model'
 [build]
diff --git a/common-content/en/module/js2/events/index.md b/common-content/en/module/js2/events/index.md
index 1c2681d13..27a330251 100644
--- a/common-content/en/module/js2/events/index.md
+++ b/common-content/en/module/js2/events/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🎬 DOM events'
+title = 'DOM events'
 
 time = 60
 facilitation = false
-emoji= '🧩'
+emoji= '🎬'
 [objectives]
     1='Describe an event in the browser environment'
     2='Update the strategy for implementing a character limit component'
@@ -33,6 +33,7 @@ An [event](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/Building_bl
 {{</note>}}
 
 Events are things that happen in the browser, which your code can ask to be told about, so that your code can react to them. In a browser context, an event could be:
+
 - a user clicking on a button
 - a user typing something into a textarea box
 - a user submitting a form
diff --git a/common-content/en/module/js2/grouping-data/index.md b/common-content/en/module/js2/grouping-data/index.md
index e3f22ad33..fc79f859a 100644
--- a/common-content/en/module/js2/grouping-data/index.md
+++ b/common-content/en/module/js2/grouping-data/index.md
@@ -1,9 +1,9 @@
 +++
-title = '💾 Grouping data'
+title = 'Grouping data'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '💾'
 [objectives]
     1='Explain why using multiple variable declarations for related data is problematic'
 [build]
diff --git a/common-content/en/module/js2/iteration/index.md b/common-content/en/module/js2/iteration/index.md
index 21273497e..5d31e532f 100644
--- a/common-content/en/module/js2/iteration/index.md
+++ b/common-content/en/module/js2/iteration/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🔁 Iteration'
+title = 'Iteration'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🔁'
 [objectives]
     1='Define iteration'
     2='Explain why iteration is relevant in a particular problem'
diff --git a/common-content/en/module/js2/key-values/index.md b/common-content/en/module/js2/key-values/index.md
index 1091dd93e..d7e7f256f 100644
--- a/common-content/en/module/js2/key-values/index.md
+++ b/common-content/en/module/js2/key-values/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🗝️ Key-value pairs'
+title = 'Key-value pairs'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🗝️'
 [objectives]
     1='Define an object property'
     2='Identify key-value pairs in an object literal'
@@ -40,4 +40,3 @@ In object literals, each **key-value pair** is separated by a comma.
 >   background-color: blue;
 > }
 > ```
->
diff --git a/common-content/en/module/js2/mean/index.md b/common-content/en/module/js2/mean/index.md
index 704cee1fb..f87a13345 100644
--- a/common-content/en/module/js2/mean/index.md
+++ b/common-content/en/module/js2/mean/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📊 Calculating the mean'
+title = 'Calculating the mean'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '📊'
 hide_from_overview = true
 [objectives]
 1='Describe how to compute the mean of a data set in JavaScript'
diff --git a/common-content/en/module/js2/median/index.md b/common-content/en/module/js2/median/index.md
index b2f47214c..a5490998c 100644
--- a/common-content/en/module/js2/median/index.md
+++ b/common-content/en/module/js2/median/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📊 Calculating the median'
+title = 'Calculating the median'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '📊'
 hide_from_overview = true
 [objectives]
 1='Describe how to calculate the median of a list in JavaScript' 
diff --git a/common-content/en/module/js2/more-median-cases/index.md b/common-content/en/module/js2/more-median-cases/index.md
index c07c487ac..55edaaa5e 100644
--- a/common-content/en/module/js2/more-median-cases/index.md
+++ b/common-content/en/module/js2/more-median-cases/index.md
@@ -1,5 +1,5 @@
 +++
-title = '📈 Implementing all the cases'
+title = 'Implementing all the cases'
 
 time = 15
 facilitation = false
diff --git a/common-content/en/module/js2/multiple-params/index.md b/common-content/en/module/js2/multiple-params/index.md
index 4d0adb313..5b3351af5 100644
--- a/common-content/en/module/js2/multiple-params/index.md
+++ b/common-content/en/module/js2/multiple-params/index.md
@@ -1,9 +1,9 @@
 +++
-title = '❓❓❓ Parsing multiple parameters'
+title = 'Parsing multiple parameters'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '❓❓'
 [objectives]
     1='Describe how to extend a strategy for one item to multiple items'
 [build]
diff --git a/common-content/en/module/js2/mutating/index.md b/common-content/en/module/js2/mutating/index.md
index 4139338b0..9b78c58e3 100644
--- a/common-content/en/module/js2/mutating/index.md
+++ b/common-content/en/module/js2/mutating/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🖊️ Mutating'
+title = 'Mutating'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🖊️'
 [objectives]
     1='Describe how to mutate an object property value'
 [build]
diff --git a/common-content/en/module/js2/mutation/index.md b/common-content/en/module/js2/mutation/index.md
index 5715cc3ce..33cbb1cc2 100644
--- a/common-content/en/module/js2/mutation/index.md
+++ b/common-content/en/module/js2/mutation/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🔀 Mutation'
+title = 'Mutation'
 
 time = 25
 facilitation = false
-emoji= '🧩'
+emoji= '🔀'
 [objectives]
     1='Define mutation'
 [build]
diff --git a/common-content/en/module/js2/no-params/index.md b/common-content/en/module/js2/no-params/index.md
index 5a2dd2a82..192defbca 100644
--- a/common-content/en/module/js2/no-params/index.md
+++ b/common-content/en/module/js2/no-params/index.md
@@ -1,9 +1,9 @@
 +++
-title = '❓ No parameters'
+title = 'No parameters'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🕳️'
 hide_from_overview = true
 [build]
   render = 'never'
@@ -25,7 +25,7 @@ An empty object behaves this way, so it makes sense to return an empty object.
 Let's create a test to explore this idea. In your `prep` dir, `touch parse-query-string.js && touch parse-query-string.test.js`. Write the following test in the `parse-query-string.test.js` file.
 
 ```js
-test("given a query string with no query parameters, returns an empty object", function() {
+test("given a query string with no query parameters, returns an empty object", function () {
   const input = "";
   const currentOutput = parseQueryString(input);
   const targetOutput = {};
diff --git a/common-content/en/module/js2/objects-workshop/index.md b/common-content/en/module/js2/objects-workshop/index.md
index f74b1d0d7..32d38d7ac 100644
--- a/common-content/en/module/js2/objects-workshop/index.md
+++ b/common-content/en/module/js2/objects-workshop/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📼 Objects Workshop'
+title = 'Objects Workshop'
 
 time = 60
 facilitation = false
-emoji= '🗄️'
+emoji= '📼'
 [objectives]
     1='Practice solving problems with objects'
 [build]
@@ -28,40 +28,40 @@ You can use the code samples below as a starting point.
 function canEat(iceCream) {}
 
 const iceCream1 = {
-	flavour: "Vanilla",
-	lactoseFree: false,
-	gramsOfSugarPerScoop: 12,
-}
+  flavour: "Vanilla",
+  lactoseFree: false,
+  gramsOfSugarPerScoop: 12,
+};
 
 const iceCream2 = {
-	flavour: "Mango Sorbet",
-	lactoseFree: true,
-	gramsOfSugarPerScoop: 10,
-}
+  flavour: "Mango Sorbet",
+  lactoseFree: true,
+  gramsOfSugarPerScoop: 10,
+};
 
 const iceCream3 = {
-	flavour: "Coconut",
-	lactoseFree: true,
-	gramsOfSugarPerScoop: 8,
-}
+  flavour: "Coconut",
+  lactoseFree: true,
+  gramsOfSugarPerScoop: 8,
+};
 
 const iceCream4 = {
-	flavour: "Strawberry",
-	lactoseFree: false,
-	gramsOfSugarPerScoop: 8,
-}
+  flavour: "Strawberry",
+  lactoseFree: false,
+  gramsOfSugarPerScoop: 8,
+};
 
 const iceCream5 = {
-	flavour: "Lemon Sorbet",
-	lactoseFree: true,
-	gramsOfSugarPerScoop: 7,
-}
-
-console.log(canEat(iceCream1)) // what should this output?
-console.log(canEat(iceCream2)) // what should this output?
-console.log(canEat(iceCream3)) // what should this output?
-console.log(canEat(iceCream4)) // what should this output?
-console.log(canEat(iceCream5)) // what should this output?
+  flavour: "Lemon Sorbet",
+  lactoseFree: true,
+  gramsOfSugarPerScoop: 7,
+};
+
+console.log(canEat(iceCream1)); // what should this output?
+console.log(canEat(iceCream2)); // what should this output?
+console.log(canEat(iceCream3)); // what should this output?
+console.log(canEat(iceCream4)); // what should this output?
+console.log(canEat(iceCream5)); // what should this output?
 ```
 
 ### Exercise 2
@@ -71,23 +71,23 @@ console.log(canEat(iceCream5)) // what should this output?
 //  and return the name of the cheaper book
 
 const fictionBook = {
-	title: "1984",
-	author: "George Orwell",
-	category: "Dystopian Fiction",
-	subcategory: "Political",
-	cost: 9.99,
-}
+  title: "1984",
+  author: "George Orwell",
+  category: "Dystopian Fiction",
+  subcategory: "Political",
+  cost: 9.99,
+};
 
 const productivityBook = {
-	title: "Atomic Habits",
-	author: "James Clear",
-	category: "Self-Help",
-	subcategory: "Productivity",
-	cost: 16.2,
-}
+  title: "Atomic Habits",
+  author: "James Clear",
+  category: "Self-Help",
+  subcategory: "Productivity",
+  cost: 16.2,
+};
 
 // this should output 1984
-console.log(getCheapest(fictionBook, productivityBook))
+console.log(getCheapest(fictionBook, productivityBook));
 ```
 
 ### Exercise 3
@@ -97,47 +97,40 @@ console.log(getCheapest(fictionBook, productivityBook))
 //	and returns an array of the names of ice creams I can eat
 //  I can eat the ice cream if it is lactose-free and contains less than 10 grams of sugar
 //  Use the solution from Exercise 1 to help you
-function whichIceCreamsCanIEat(iceCreams) {
-}
+function whichIceCreamsCanIEat(iceCreams) {}
 
 const iceCream1 = {
-	flavour: "Vanilla",
-	lactoseFree: false,
-	gramsOfSugarPerScoop: 12,
-}
+  flavour: "Vanilla",
+  lactoseFree: false,
+  gramsOfSugarPerScoop: 12,
+};
 
 const iceCream2 = {
-	flavour: "Mango Sorbet",
-	lactoseFree: true,
-	gramsOfSugarPerScoop: 10,
-}
+  flavour: "Mango Sorbet",
+  lactoseFree: true,
+  gramsOfSugarPerScoop: 10,
+};
 
 const iceCream3 = {
-	flavour: "Coconut",
-	lactoseFree: true,
-	gramsOfSugarPerScoop: 8,
-}
+  flavour: "Coconut",
+  lactoseFree: true,
+  gramsOfSugarPerScoop: 8,
+};
 
 const iceCream4 = {
-	flavour: "Strawberry",
-	lactoseFree: false,
-	gramsOfSugarPerScoop: 8,
-}
+  flavour: "Strawberry",
+  lactoseFree: false,
+  gramsOfSugarPerScoop: 8,
+};
 
 const iceCream5 = {
-	flavour: "Lemon Sorbet",
-	lactoseFree: true,
-	gramsOfSugarPerScoop: 7,
-}
-
-const allIceCreams = [
-	iceCream1,
-	iceCream2,
-	iceCream3,
-	iceCream4,
-	iceCream5,	
-]
-
-const iceCreamsICanEat = whichIceCreamsCanIEat(allIceCreams)
-console.log(iceCreamsICanEat) // what should this output?
-```
\ No newline at end of file
+  flavour: "Lemon Sorbet",
+  lactoseFree: true,
+  gramsOfSugarPerScoop: 7,
+};
+
+const allIceCreams = [iceCream1, iceCream2, iceCream3, iceCream4, iceCream5];
+
+const iceCreamsICanEat = whichIceCreamsCanIEat(allIceCreams);
+console.log(iceCreamsICanEat); // what should this output?
+```
diff --git a/common-content/en/module/js2/one-pair/index.md b/common-content/en/module/js2/one-pair/index.md
index 881538d78..1878ccd7d 100644
--- a/common-content/en/module/js2/one-pair/index.md
+++ b/common-content/en/module/js2/one-pair/index.md
@@ -1,9 +1,9 @@
 +++
-title = '❓ Parsing a single key-value pair'
+title = 'Parsing a single key-value pair'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '❓'
 [objectives]
     1='Suggest a way of splitting a string into an array'
     2='Destructure an array of length 2'
diff --git a/common-content/en/module/js2/ordered-data/index.md b/common-content/en/module/js2/ordered-data/index.md
index dd3408987..dd39781f2 100644
--- a/common-content/en/module/js2/ordered-data/index.md
+++ b/common-content/en/module/js2/ordered-data/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📏 Ordered data'
+title = 'Ordered data'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '📏'
 [objectives]
     1='Explain the limitations of arrays when storing data'
 [build]
diff --git a/common-content/en/module/js2/pair-up/index.md b/common-content/en/module/js2/pair-up/index.md
index b56543a24..719dfe4e7 100644
--- a/common-content/en/module/js2/pair-up/index.md
+++ b/common-content/en/module/js2/pair-up/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🫱🏿‍🫲🏾 Pair up'
+title = 'Pair up'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🫱🏿‍🫲'
 [objectives]
 1="Prepare for next week's project"
 [build]
diff --git a/common-content/en/module/js2/pick-an-app/index.md b/common-content/en/module/js2/pick-an-app/index.md
index dca1883db..dd86b52e8 100644
--- a/common-content/en/module/js2/pick-an-app/index.md
+++ b/common-content/en/module/js2/pick-an-app/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪀 Discuss an app'
+title = 'Discuss an app'
 
 time = 85
 facilitation = false
-emoji= '🧩'
+emoji= '🪀'
 [objectives]
 1='Discuss problem solving strategies in groups'
 2='Check required functionality against acceptance criteria'
diff --git a/common-content/en/module/js2/plan/index.md b/common-content/en/module/js2/plan/index.md
index 2096ad93c..4265cf89c 100644
--- a/common-content/en/module/js2/plan/index.md
+++ b/common-content/en/module/js2/plan/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧭 Breaking down the strategy'
+title = 'Breaking down the strategy'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '⛓️‍💥'
 hide_from_overview = true
 [objectives]
     1='Break down a problem into a series of steps'
@@ -22,6 +22,7 @@ A[Step 1: Define the character limit of 200] --> B[Step 2: Access the textarea e
 ```
 
 There are two times we may want to do this:
+
 1. When the page first loads we should show the _initial_ limit.
 2. Whenever the user adds or removes a character from the textarea, we want to _update_ to show the remaining limit.
 
diff --git a/common-content/en/module/js2/query-string/index.md b/common-content/en/module/js2/query-string/index.md
index 20627215f..6457e75f7 100644
--- a/common-content/en/module/js2/query-string/index.md
+++ b/common-content/en/module/js2/query-string/index.md
@@ -1,9 +1,9 @@
 +++
-title = '❓🪢 Query strings'
+title = 'Query strings'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '❓🪢'
 [objectives]
 1='Identify the query string section of a URL'
 2='Identify query parameters within a query string'
diff --git a/common-content/en/module/js2/querying/index.md b/common-content/en/module/js2/querying/index.md
index f2e3d6a4d..27dce4b91 100644
--- a/common-content/en/module/js2/querying/index.md
+++ b/common-content/en/module/js2/querying/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🔎 Querying the DOM'
+title = 'Querying the DOM'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🔍'
 [objectives]
     1='Access elements in the DOM using selector methods'
 [build]
diff --git a/common-content/en/module/js2/reacting/index.md b/common-content/en/module/js2/reacting/index.md
index a8dff7ab1..68bcbbe9b 100644
--- a/common-content/en/module/js2/reacting/index.md
+++ b/common-content/en/module/js2/reacting/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📤 Reacting to events'
+title = 'Reacting to events'
 
 time = 60
 facilitation = false
-emoji= '🧩'
+emoji= '📤'
 [objectives]
     1='Identify the syntactic features of a call to addEventListener'
     2='Explain when an event listener is called'
diff --git a/common-content/en/module/js2/refactor/index.md b/common-content/en/module/js2/refactor/index.md
index 5242ae291..5e1b9c0e0 100644
--- a/common-content/en/module/js2/refactor/index.md
+++ b/common-content/en/module/js2/refactor/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧩 Refactor'
+title = 'Refactor'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🧹'
 [objectives]
     1='Identify and remove duplicated code'
 [build]
diff --git a/common-content/en/module/js2/reference/index.md b/common-content/en/module/js2/reference/index.md
index 0490a2bcc..f6a1096be 100644
--- a/common-content/en/module/js2/reference/index.md
+++ b/common-content/en/module/js2/reference/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🏤 References'
+title = 'References'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🏤'
 [objectives]
     1='Define reference'
     2='Describe some effects of variables being assigned the same array reference'
diff --git a/common-content/en/module/js2/side-effects/index.md b/common-content/en/module/js2/side-effects/index.md
index 495ad7a2a..e71e7c5d0 100644
--- a/common-content/en/module/js2/side-effects/index.md
+++ b/common-content/en/module/js2/side-effects/index.md
@@ -1,9 +1,9 @@
 +++
-title = '⚠️ Side effects'
+title = 'Side effects'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🤕'
 [objectives]
     1='Define a side effect'
     2='Describe how side effects lead to buggy code'
diff --git a/common-content/en/module/js2/summing/index.md b/common-content/en/module/js2/summing/index.md
index 1e056b503..4a728b07d 100644
--- a/common-content/en/module/js2/summing/index.md
+++ b/common-content/en/module/js2/summing/index.md
@@ -1,9 +1,9 @@
 +++
-title = '➕ Summation'
+title = 'Summation'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '➕'
 hide_from_overview = true
 [objectives]
     1='Describe how to sum the numbers in a list'
diff --git a/common-content/en/module/js2/timing/index.md b/common-content/en/module/js2/timing/index.md
index c45c8f2ec..a79809c3a 100644
--- a/common-content/en/module/js2/timing/index.md
+++ b/common-content/en/module/js2/timing/index.md
@@ -1,8 +1,8 @@
 +++
-title = '⏰ Timers'
+title = 'Timers'
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '⏰'
 [objectives]
     1='Explain how we can call functions back after a set amount of time'
     2='Describe how to use setTimeout'
@@ -47,6 +47,6 @@ Let's break this down this call to `setTimeout`. It is saying:
 
 Notice we're saying _at least_ 3000 ms because `setTimeout` guarantees a minimum amount of time: it doesn't say that `printMessage` must be called _exactly_ after 3000 ms. In this example, we say that `printMessage` is a {{<tooltip title="callback function">}}A callback function is a function that is passed as an argument to another function. We ourselves don't call the callback function - something else will call it for us at the right time.{{</tooltip>}} as it is _called back_ after 3000 milliseconds.
 
-Run this code in your terminal.  In the terminal, you'll see "Daniel" appear first. After at least a 3000 ms delay, you will see console log of "Sally". Now play computer with some different combinations of timeouts and function calls. Set timeouts on a series of simple functions you can write yourself. Play with the numbers and line orders, and see if you can predict the execution order reliably.  
+Run this code in your terminal. In the terminal, you'll see "Daniel" appear first. After at least a 3000 ms delay, you will see console log of "Sally". Now play computer with some different combinations of timeouts and function calls. Set timeouts on a series of simple functions you can write yourself. Play with the numbers and line orders, and see if you can predict the execution order reliably.
 
 We will explore callbacks in more detail later on.
diff --git a/common-content/en/module/js2/update/index.md b/common-content/en/module/js2/update/index.md
index 6425e2346..6a1f7954b 100644
--- a/common-content/en/module/js2/update/index.md
+++ b/common-content/en/module/js2/update/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🏷️ Updating the interface'
+title = 'Updating the interface'
 
 time = 25
 facilitation = false
-emoji= '🧩'
+emoji= '🏷️'
 [objectives]
     1='Access and modify the textContent of a html element'
 [build]
@@ -18,6 +18,7 @@ We know we don't want to always have the number "200" in the text "You have 200
 We've solved Step 3: Calculate the number of characters left. So we know what value we want to show.
 
 All that remains is:
+
 1. To solve Step 4: Update the interface with the number of characters left.
 2. To make this happen on page load.
 3. To make this also happen when the textarea changes.
@@ -67,7 +68,12 @@ We want to do this because we have another way of setting this. If we wanted to
       <label for="comment-input">
         Please enter your comment in the text area below
       </label>
-      <textarea id="comment-input" name="comment-input" rows="5" maxlength="200"></textarea>
+      <textarea
+        id="comment-input"
+        name="comment-input"
+        rows="5"
+        maxlength="200"
+      ></textarea>
       <p id="character-limit-info"></p>
     </section>
   </body>
diff --git a/common-content/en/module/js2/variable-keys/index.md b/common-content/en/module/js2/variable-keys/index.md
index ba9d241ec..88af00443 100644
--- a/common-content/en/module/js2/variable-keys/index.md
+++ b/common-content/en/module/js2/variable-keys/index.md
@@ -1,9 +1,9 @@
 +++
-title = '[ ] Access with variables'
+title = 'Access with variables'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🍌'
 [objectives]
     1='Explain when square bracket notation may be necessary to access an object'
     2='Explain why a previous test breaks once the implementation changes'
diff --git a/common-content/en/module/js3/actually-re-rendering/index.md b/common-content/en/module/js3/actually-re-rendering/index.md
index e5be46832..39b68420a 100644
--- a/common-content/en/module/js3/actually-re-rendering/index.md
+++ b/common-content/en/module/js3/actually-re-rendering/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🔁 Actually re-rendering'
+title = 'Actually re-rendering'
 
 time = 30
 facilitation = false
diff --git a/common-content/en/module/js3/applying-map/index.md b/common-content/en/module/js3/applying-map/index.md
index 36ea8a04a..8d25f30b9 100644
--- a/common-content/en/module/js3/applying-map/index.md
+++ b/common-content/en/module/js3/applying-map/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🗺️ Applying map to our problem'
+title = 'Applying map to our problem'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🗺️'
 hide_from_overview = true
 [objectives]
     1='Use map to render multiple film cards'
diff --git a/common-content/en/module/js3/async-await/index.md b/common-content/en/module/js3/async-await/index.md
index 1409f5d42..f0381f52f 100644
--- a/common-content/en/module/js3/async-await/index.md
+++ b/common-content/en/module/js3/async-await/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🍬 async/await'
+title = 'async/await'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🍬'
 [objectives]
     1='Define syntactic sugar'
     2='Write a function using async/await'
@@ -23,7 +23,7 @@ const getProfile = async (url) => {
   const data = await response.json();
   const htmlUrl = data.html_url;
   console.log(htmlUrl);
-}
+};
 
 getProfile("https://api.github.com/users/SallyMcGrath");
 ```
@@ -72,8 +72,9 @@ const getProfile = async (url) => {
   return response.json();
 };
 
-getProfile("https://api.github.com/users/SallyMcGrath")
-  .then((response) => console.log(response))
+getProfile("https://api.github.com/users/SallyMcGrath").then((response) =>
+  console.log(response)
+);
 ```
 
 Save this to a file and run with with node. It works the same as before.
diff --git a/common-content/en/module/js3/asynchrony/index.md b/common-content/en/module/js3/asynchrony/index.md
index 400d56310..0c53a1e8b 100644
--- a/common-content/en/module/js3/asynchrony/index.md
+++ b/common-content/en/module/js3/asynchrony/index.md
@@ -1,9 +1,9 @@
 +++
-title = '⏳ Asynchrony : outside time'
+title = 'Asynchrony : outside time'
 
 time = 40
 facilitation = false
-emoji= '🧩'
+emoji= '⏳'
 [objectives]
 1="Define asynchrony"
 2="Explain why we need asynchrony"
diff --git a/common-content/en/module/js3/break-down/index.md b/common-content/en/module/js3/break-down/index.md
index af58d1894..6a26739b1 100644
--- a/common-content/en/module/js3/break-down/index.md
+++ b/common-content/en/module/js3/break-down/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🧩 Break down the problem'
+title = 'Break down the problem'
 
 time = "30"
 facilitation = false
diff --git a/common-content/en/module/js3/callbacks/index.md b/common-content/en/module/js3/callbacks/index.md
index c02c700db..c6cf43294 100644
--- a/common-content/en/module/js3/callbacks/index.md
+++ b/common-content/en/module/js3/callbacks/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪃 Callbacks'
+title = 'Callbacks'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🪃'
 [objectives]
 1='Define a callback'
 2="Sketch the event loop"
diff --git a/common-content/en/module/js3/capturing-events/index.md b/common-content/en/module/js3/capturing-events/index.md
index 3612c9959..0375545d5 100644
--- a/common-content/en/module/js3/capturing-events/index.md
+++ b/common-content/en/module/js3/capturing-events/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🦻🏻 Capturing the user event'
+title = 'Capturing the user event'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🦻🏻'
 [objectives]
     1='Add an event listener to a user input'
 [build]
diff --git a/common-content/en/module/js3/catch/index.md b/common-content/en/module/js3/catch/index.md
index 42934a42c..444776f47 100644
--- a/common-content/en/module/js3/catch/index.md
+++ b/common-content/en/module/js3/catch/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🥎 try/catch'
+title = 'try/catch'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🥎'
 [objectives]
     1='Define a try/catch block'
     2='Handle an error'
diff --git a/common-content/en/module/js3/chaining/index.md b/common-content/en/module/js3/chaining/index.md
index 6664d36dd..618f9b382 100644
--- a/common-content/en/module/js3/chaining/index.md
+++ b/common-content/en/module/js3/chaining/index.md
@@ -3,7 +3,7 @@ title = 'Chaining Promises'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🔗'
 [objectives]
 [build]
   render = 'never'
diff --git a/common-content/en/module/js3/check-in-coordinate/index.md b/common-content/en/module/js3/check-in-coordinate/index.md
index ece39f4c0..6296ad0f4 100644
--- a/common-content/en/module/js3/check-in-coordinate/index.md
+++ b/common-content/en/module/js3/check-in-coordinate/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📝 Check-in ➡️ Coordinate'
+title = 'Check-in ➡️ Coordinate'
 
 facilitation = false
 time=10
-emoji= '🧩'
+emoji= '📝'
 [objectives]
 1="Perform quick temperature check on the current concepts"
 2="Devise strategies for dealing with misconceptions during the week"
diff --git a/common-content/en/module/js3/components/index.md b/common-content/en/module/js3/components/index.md
index 54abb79e1..69846a148 100644
--- a/common-content/en/module/js3/components/index.md
+++ b/common-content/en/module/js3/components/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🃏 Reusable components'
+title = 'Reusable components'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🃏'
 [objectives]
     1='Implement components for a user interface'
 [build]
@@ -35,9 +35,13 @@ const createFilmCard = (film) => {
   const card = template.content.cloneNode(true);
   // Now we are querying our cloned fragment, not the entire page.
   card.querySelector("h3").textContent = film.title;
-  card.querySelector("[data-director]").textContent = `Director: ${film.director}`;
+  card.querySelector(
+    "[data-director]"
+  ).textContent = `Director: ${film.director}`;
   card.querySelector("time").textContent = `${film.duration} minutes`;
-  card.querySelector("[data-certificate]").textContent = `Certificate: ${film.certificate}`;
+  card.querySelector(
+    "[data-certificate]"
+  ).textContent = `Certificate: ${film.certificate}`;
   // Return the card, rather than directly appending it to the page
   return card;
 };
diff --git a/common-content/en/module/js3/composing-elements/index.md b/common-content/en/module/js3/composing-elements/index.md
index fc042b109..223151a82 100644
--- a/common-content/en/module/js3/composing-elements/index.md
+++ b/common-content/en/module/js3/composing-elements/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧱 Composing elements'
+title = 'Composing elements'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🧱'
 [objectives]
     1='Compose UI elements to some specification'
     2='Append DOM elements to other nodes in the DOM tree'
diff --git a/common-content/en/module/js3/data-ui/index.md b/common-content/en/module/js3/data-ui/index.md
index 965e59c12..3ca52552f 100644
--- a/common-content/en/module/js3/data-ui/index.md
+++ b/common-content/en/module/js3/data-ui/index.md
@@ -1,9 +1,9 @@
 +++
-title = '💾 ➡️ 💻 Rendering Data as UI'
+title = 'Rendering Data as UI'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '💾 ➡️ 💻'
 [objectives]
     1='Explain how data is rendered into a user interface'
 [build]
diff --git a/common-content/en/module/js3/diagnose/index.md b/common-content/en/module/js3/diagnose/index.md
index 572711acf..974b78bfa 100644
--- a/common-content/en/module/js3/diagnose/index.md
+++ b/common-content/en/module/js3/diagnose/index.md
@@ -1,8 +1,8 @@
 +++
-title = '🌡️ Diagnose'
+title = 'Diagnose'
 
 facilitation = false
-emoji= '🧩'
+emoji= '🌡️'
 [objectives]
 1='Identify areas of weakness'
 2='Address misconceptions from prep work'
diff --git a/common-content/en/module/js3/fetch-films/index.md b/common-content/en/module/js3/fetch-films/index.md
index f6ae795eb..6eb5c9a38 100644
--- a/common-content/en/module/js3/fetch-films/index.md
+++ b/common-content/en/module/js3/fetch-films/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🐕 🎞️ fetch films'
+title = 'Fetch Films'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🐕 🎞️'
 [objectives]
     1='Apply fetch to get data from an API'
 [build]
@@ -24,7 +24,7 @@ const fetchFilms = async () => {
 };
 
 fetchFilms().then((films) => {
-   // When the fetchFilms Promise resolves, this callback will be called.
+  // When the fetchFilms Promise resolves, this callback will be called.
   state.films = films;
   render();
 });
diff --git a/common-content/en/module/js3/fetch/index.md b/common-content/en/module/js3/fetch/index.md
index 094487815..571517c43 100644
--- a/common-content/en/module/js3/fetch/index.md
+++ b/common-content/en/module/js3/fetch/index.md
@@ -3,7 +3,7 @@ title = 'fetch API'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🐕'
 [objectives]
 [build]
   render = 'never'
diff --git a/common-content/en/module/js3/fetching-data/index.md b/common-content/en/module/js3/fetching-data/index.md
index 1552797b0..b046d4756 100644
--- a/common-content/en/module/js3/fetching-data/index.md
+++ b/common-content/en/module/js3/fetching-data/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🐕 Fetching data'
+title = 'Fetching data'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🐕'
 [objectives]
     1='Define a client side Web API'
     2='Define a server side API'
diff --git a/common-content/en/module/js3/identifying-state/index.md b/common-content/en/module/js3/identifying-state/index.md
index b75662154..b1fba458c 100644
--- a/common-content/en/module/js3/identifying-state/index.md
+++ b/common-content/en/module/js3/identifying-state/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🔎 Identifying state'
+title = 'Identifying state'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🔎'
 [objectives]
     1='Identify the state in a given problem'
 [build]
diff --git a/common-content/en/module/js3/internet/index.md b/common-content/en/module/js3/internet/index.md
index 01e1fc4a3..b43f2e428 100644
--- a/common-content/en/module/js3/internet/index.md
+++ b/common-content/en/module/js3/internet/index.md
@@ -3,7 +3,7 @@ title = 'How the internet works'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🌐'
 [objectives]
   1='Describe what happens when a user enters a url into a browser'
   2='Explain the purpose of the HTTP protocol'
diff --git a/common-content/en/module/js3/introducing-new-state/index.md b/common-content/en/module/js3/introducing-new-state/index.md
index 6bc2328ee..7dcb87f4d 100644
--- a/common-content/en/module/js3/introducing-new-state/index.md
+++ b/common-content/en/module/js3/introducing-new-state/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🆕 Introducing new state'
+title = 'Introducing new state'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🆕'
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/js3/latency/index.md b/common-content/en/module/js3/latency/index.md
index e010e7632..9a09969e1 100644
--- a/common-content/en/module/js3/latency/index.md
+++ b/common-content/en/module/js3/latency/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🗓️ Latency'
+title = 'Latency'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🗓️'
 [objectives]
   1='Define latency'
 [build]
diff --git a/common-content/en/module/js3/now-showing/index.md b/common-content/en/module/js3/now-showing/index.md
index 52e69ea95..eff13abee 100644
--- a/common-content/en/module/js3/now-showing/index.md
+++ b/common-content/en/module/js3/now-showing/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📽️ Cinema listings'
+title = 'Cinema listings'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '📽️'
 hide_from_overview = true
 [objectives]
     1='Define an acceptance criterion for building a web page'
diff --git a/common-content/en/module/js3/one-to-one/index.md b/common-content/en/module/js3/one-to-one/index.md
index 5aca506af..626156077 100644
--- a/common-content/en/module/js3/one-to-one/index.md
+++ b/common-content/en/module/js3/one-to-one/index.md
@@ -1,9 +1,9 @@
 +++
-title = '👭🏾 One-to-one mappings'
+title = 'One-to-one mappings'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '👭🏾'
 hide_from_overview = true
 [objectives]
     1='Describe how to render a list of data'
diff --git a/common-content/en/module/js3/promises/index.md b/common-content/en/module/js3/promises/index.md
index 1e542b25e..271f3beeb 100644
--- a/common-content/en/module/js3/promises/index.md
+++ b/common-content/en/module/js3/promises/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🫱🏿‍🫲🏽 Promises'
+title = 'Promises'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji = '🫱🏿‍🫲🏽 '
 [objectives]
     1='Define a Promise'
     2='Log a Promise to the console'
diff --git a/common-content/en/module/js3/re-rendering-ui/index.md b/common-content/en/module/js3/re-rendering-ui/index.md
index f29911727..1461d5cc1 100644
--- a/common-content/en/module/js3/re-rendering-ui/index.md
+++ b/common-content/en/module/js3/re-rendering-ui/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪞 Re-rendering the UI'
+title = 'Re-rendering the UI'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '🪞'
 [objectives]
     1='Trace the flow of data from user input to updated UI'
 [build]
diff --git a/common-content/en/module/js3/re-rendering/index.md b/common-content/en/module/js3/re-rendering/index.md
index cffd579d7..45f4b5fcd 100644
--- a/common-content/en/module/js3/re-rendering/index.md
+++ b/common-content/en/module/js3/re-rendering/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🔁 Re-rendering'
+title = 'Re-rendering'
 
 time = 10
 facilitation = false
@@ -60,9 +60,13 @@ We should have a page like this:
         const card = template.content.cloneNode(true);
         // Now we are querying our cloned fragment, not the entire page.
         card.querySelector("h3").textContent = film.title;
-        card.querySelector("[data-director]").textContent = `Director: ${film.director}`;
+        card.querySelector(
+          "[data-director]"
+        ).textContent = `Director: ${film.director}`;
         card.querySelector("time").textContent = `${film.duration} minutes`;
-        card.querySelector("[data-certificate]").textContent = `Certificate: ${film.certificate}`;
+        card.querySelector(
+          "[data-certificate]"
+        ).textContent = `Certificate: ${film.certificate}`;
         // Return the card, rather than directly appending it to the page
         return card;
       };
diff --git a/common-content/en/module/js3/reacting/index.md b/common-content/en/module/js3/reacting/index.md
index 94b417288..4f1765c2f 100644
--- a/common-content/en/module/js3/reacting/index.md
+++ b/common-content/en/module/js3/reacting/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪄 Reacting to user input'
+title = 'Reacting to user input'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🪄'
 [objectives]
     1='Explain how JavaScript can react to user input from a search input'
 [build]
diff --git a/common-content/en/module/js3/refactoring-to-state-and-render/index.md b/common-content/en/module/js3/refactoring-to-state-and-render/index.md
index 4e7ba2526..cb6b0b1aa 100644
--- a/common-content/en/module/js3/refactoring-to-state-and-render/index.md
+++ b/common-content/en/module/js3/refactoring-to-state-and-render/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧼 Refactoring to state+render'
+title = 'Refactoring to state+render'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🧼'
 [objectives]
     1='Structure code to use state and render'
     2='Define refactoring'
diff --git a/common-content/en/module/js3/rendering-based-on-state/index.md b/common-content/en/module/js3/rendering-based-on-state/index.md
index 2f3d0fbe6..2ab901bfc 100644
--- a/common-content/en/module/js3/rendering-based-on-state/index.md
+++ b/common-content/en/module/js3/rendering-based-on-state/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🎱 Rendering based on state'
+title = 'Rendering based on state'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🎱'
 [objectives]
     1='Filter films based on search terms'
     2='Render a filtered list'
diff --git a/common-content/en/module/js3/simplifying-element-creation/index.md b/common-content/en/module/js3/simplifying-element-creation/index.md
index e9a2bb221..0a0981c21 100644
--- a/common-content/en/module/js3/simplifying-element-creation/index.md
+++ b/common-content/en/module/js3/simplifying-element-creation/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧼 Creating elements with functions'
+title = 'Creating elements with functions'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🧼'
 [objectives]
     1='Extract functions for common tasks'
     2='Identify benefits of using reusable functions'
@@ -83,7 +83,7 @@ This code does exactly the same thing as the code we had before. By introducing
 1. Our code is smaller, which can make it easier to read and understand what it's doing.
 2. If we want to change how we create elements we only need to write the new code one time, not for every element. We could add a class attribute for each element easily.
 3. We can see that each element is being created the same way. Before, we would have to compare several lines of code to see this. Because we can see they're calling the same function, we know they're made the same way.
-4. We're less likely to make mistakes copying and pasting the code. In the first version of this content, we actually wrote ``duration.textContent = `Certificate: ${film.certificate}`;`` instead of ``certificate.textContent = `Certificate: ${film.certificate}`;`` because we were just copying and pasting and missed an update. The less we need to copy and paste and update code, the less likely we are to miss an update.
+4. We're less likely to make mistakes copying and pasting the code. In the first version of this content, we actually wrote `` duration.textContent = `Certificate: ${film.certificate}`; `` instead of `` certificate.textContent = `Certificate: ${film.certificate}`; `` because we were just copying and pasting and missed an update. The less we need to copy and paste and update code, the less likely we are to miss an update.
 
 There are also some drawbacks to our refactoring:
 
diff --git a/common-content/en/module/js3/single-datum/index.md b/common-content/en/module/js3/single-datum/index.md
index 4aa38dde9..cb8cf27da 100644
--- a/common-content/en/module/js3/single-datum/index.md
+++ b/common-content/en/module/js3/single-datum/index.md
@@ -1,9 +1,9 @@
 +++
-title = '💽 Rendering one card'
+title = 'Rendering one card'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '💽'
 hide_from_overview = true
 [objectives]
     1='Define a sub-goal for rendering data in the user interface'
diff --git a/common-content/en/module/js3/template-html/index.md b/common-content/en/module/js3/template-html/index.md
index 503b0f9e6..6296a1075 100644
--- a/common-content/en/module/js3/template-html/index.md
+++ b/common-content/en/module/js3/template-html/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🍱 Creating elements with <template>'
+title = 'Creating elements with <template>'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🍱'
 [objectives]
     1='Use template tags to simplify element initialisation'
     2='Identify trade-offs between using functions vs template tags to create components'
@@ -51,9 +51,13 @@ const film = {
 const card = document.getElementById("film-card").content.cloneNode(true);
 // Now we are querying our cloned fragment, not the entire page.
 card.querySelector("h3").textContent = film.title;
-card.querySelector("[data-director]").textContent = `Director: ${film.director}`;
+card.querySelector(
+  "[data-director]"
+).textContent = `Director: ${film.director}`;
 card.querySelector("time").textContent = `${film.duration} minutes`;
-card.querySelector("[data-certificate]").textContent = `Certificate: ${film.certificate}`;
+card.querySelector(
+  "[data-certificate]"
+).textContent = `Certificate: ${film.certificate}`;
 
 document.body.append(card);
 ```
diff --git a/common-content/en/module/js3/then/index.md b/common-content/en/module/js3/then/index.md
index 2e3d55ca0..15d6004b8 100644
--- a/common-content/en/module/js3/then/index.md
+++ b/common-content/en/module/js3/then/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪆 .then()'
+title = '.then()'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🪆'
 [objectives]
     1='Chain then() on to a Promise'
 [build]
diff --git a/common-content/en/module/js3/using-fetch/index.md b/common-content/en/module/js3/using-fetch/index.md
index 2bd583a32..cdb09af3e 100644
--- a/common-content/en/module/js3/using-fetch/index.md
+++ b/common-content/en/module/js3/using-fetch/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🌐 Requesting from a server side API'
+title = 'Requesting from a server side API'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🌐'
 [objectives]
 1="Fetch data from a server side API using a client side Web API"
 [build]
@@ -40,7 +40,7 @@ const fetchFilms = async () => {
 }; // Our async function returns a Promise
 
 fetchFilms().then((films) => {
-   // When the fetchFilms Promise resolves, this callback will be called.
+  // When the fetchFilms Promise resolves, this callback will be called.
   state.films = films;
   render();
 });
diff --git a/common-content/en/module/js3/using-map/index.md b/common-content/en/module/js3/using-map/index.md
index 38cb2a8ee..c53e4da51 100644
--- a/common-content/en/module/js3/using-map/index.md
+++ b/common-content/en/module/js3/using-map/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🗺️ Using map'
+title = 'Using map'
 
 time = 60
 facilitation = false
-emoji= '🧩'
+emoji= '🗺️'
 [objectives]
     1='Describe how to use map'
 [build]
diff --git a/common-content/en/module/onboarding/blockers/index.md b/common-content/en/module/onboarding/blockers/index.md
index ffab3a34a..69aaf3d5e 100644
--- a/common-content/en/module/onboarding/blockers/index.md
+++ b/common-content/en/module/onboarding/blockers/index.md
@@ -3,7 +3,7 @@ title = 'Sharing Our Blockers'
 time = 45
 facilitation = false
 vocabulary=["Blockers"]
-emoji= '🧩'
+emoji= '🚧'
 [objectives]
 1='Identify blockers'
 2='Share blockers on a board or sticky notes'
diff --git a/common-content/en/module/onboarding/demo/index.md b/common-content/en/module/onboarding/demo/index.md
index def393b63..e24d4aa87 100644
--- a/common-content/en/module/onboarding/demo/index.md
+++ b/common-content/en/module/onboarding/demo/index.md
@@ -1,5 +1,6 @@
 +++
 title="Demo"
+emoji="🎤"
 time=45
 objectives = [
     "Explain your work to others at CEFR B2 level or higher.",
diff --git a/common-content/en/module/portfolio/break-it-down/index.md b/common-content/en/module/portfolio/break-it-down/index.md
index 0e63a6298..c0177b6ac 100644
--- a/common-content/en/module/portfolio/break-it-down/index.md
+++ b/common-content/en/module/portfolio/break-it-down/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🧩 Break it down'
+title = 'Break it down'
 
 time = 60
 facilitation = false
diff --git a/common-content/en/module/portfolio/data/index.md b/common-content/en/module/portfolio/data/index.md
index 070809f9f..52edec809 100644
--- a/common-content/en/module/portfolio/data/index.md
+++ b/common-content/en/module/portfolio/data/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🗃️ Data'
+title = 'Data'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🗃️'
 [objectives]
     1='Identify core components required to supply data and functionality to the user interface'
 [build]
diff --git a/common-content/en/module/portfolio/employability/index.md b/common-content/en/module/portfolio/employability/index.md
index c7c138603..3909f8f8f 100644
--- a/common-content/en/module/portfolio/employability/index.md
+++ b/common-content/en/module/portfolio/employability/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🪞 Employability'
+title = 'Employability'
 
 time = 60
 facilitation = false
diff --git a/common-content/en/module/portfolio/ground-rules/index.md b/common-content/en/module/portfolio/ground-rules/index.md
index 7d2f0facb..3ae12bca2 100644
--- a/common-content/en/module/portfolio/ground-rules/index.md
+++ b/common-content/en/module/portfolio/ground-rules/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📏 Ground rules'
+title = 'Ground rules'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '📏'
 [objectives]
     1='Establish the rules for getting a new project off the ground'
 [build]
diff --git a/common-content/en/module/portfolio/guest/index.md b/common-content/en/module/portfolio/guest/index.md
index b2d99c7fa..d8b055fb6 100644
--- a/common-content/en/module/portfolio/guest/index.md
+++ b/common-content/en/module/portfolio/guest/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🎤 Guest Speaker'
+title = 'Guest Speaker'
 
 time = 60
 facilitation = false
diff --git a/common-content/en/module/portfolio/interfaces/index.md b/common-content/en/module/portfolio/interfaces/index.md
index 30b1d9f48..74e968464 100644
--- a/common-content/en/module/portfolio/interfaces/index.md
+++ b/common-content/en/module/portfolio/interfaces/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🕹️ User Interface'
+title = 'User Interface'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🕹️'
 [objectives]
     1='Identify key features for the user interface'
     2='Propose basic designs for key parts of the user interface'
diff --git a/common-content/en/module/portfolio/next-steps/index.md b/common-content/en/module/portfolio/next-steps/index.md
deleted file mode 100644
index bd4c5682c..000000000
--- a/common-content/en/module/portfolio/next-steps/index.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## Next steps
-
-- Comms: how are you going to communicate with each other during the week
-- Git workflow: what does your git workflow look like? 
diff --git a/common-content/en/module/portfolio/project/index.md b/common-content/en/module/portfolio/project/index.md
index e6571458c..a47a6f9fe 100644
--- a/common-content/en/module/portfolio/project/index.md
+++ b/common-content/en/module/portfolio/project/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🧩 Project time'
+title = 'Project time'
 
 time = 60
 facilitation = false
-emoji= '🧩'
+emoji= '🛠️'
 [objectives]
     1='Work on your project'
 [build]
diff --git a/common-content/en/module/portfolio/requirements/index.md b/common-content/en/module/portfolio/requirements/index.md
index 35926c936..5d9149a65 100644
--- a/common-content/en/module/portfolio/requirements/index.md
+++ b/common-content/en/module/portfolio/requirements/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🔎 Gathering requirements'
+title = 'Gathering requirements'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🛍️'
 [objectives]
     1='Choose a project brief'
     2='Identify and explain the key user stories for your project'
diff --git a/common-content/en/module/portfolio/stand-up/index.md b/common-content/en/module/portfolio/stand-up/index.md
index cce8245d7..57d795c5b 100644
--- a/common-content/en/module/portfolio/stand-up/index.md
+++ b/common-content/en/module/portfolio/stand-up/index.md
@@ -1,5 +1,5 @@
 +++
-title = '😉 Stand up'
+title = 'Stand up'
 
 time = 15
 facilitation = false
diff --git a/common-content/en/module/portfolio/user-feedback/index.md b/common-content/en/module/portfolio/user-feedback/index.md
deleted file mode 100644
index 529ea5cda..000000000
--- a/common-content/en/module/portfolio/user-feedback/index.md
+++ /dev/null
@@ -1,4 +0,0 @@
-## User feedback
-
-- Analyse feedback on your application as it is so far. Can users make use of any functionality
-- If users cannot interact with your application - then this is also good feedback! How can you get feedback as quickly as possible?
diff --git a/common-content/en/module/react/components/index.md b/common-content/en/module/react/components/index.md
index 2a3f0802f..24747b7ca 100644
--- a/common-content/en/module/react/components/index.md
+++ b/common-content/en/module/react/components/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🧩 Components'
+title = 'Components'
 
 time = 30
 facilitation = false
diff --git a/common-content/en/module/react/controlled-components/index.md b/common-content/en/module/react/controlled-components/index.md
index d4567bcbd..2f8f5d653 100644
--- a/common-content/en/module/react/controlled-components/index.md
+++ b/common-content/en/module/react/controlled-components/index.md
@@ -1,9 +1,9 @@
 +++
-title = "🪤 Controlled Components"
+title = "Controlled Components"
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🪤'
 [objectives]
     1='React to user input with state'
 [build]
diff --git a/common-content/en/module/react/embedding-javascript/index.md b/common-content/en/module/react/embedding-javascript/index.md
index b3267e994..e7bdb8747 100644
--- a/common-content/en/module/react/embedding-javascript/index.md
+++ b/common-content/en/module/react/embedding-javascript/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🐇 Embedding JavaScript'
+title = 'Embedding JavaScript'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🐇'
 [objectives]
     1='Embed JavaScript in JSX'
     2='Dynamically specify values in JSX'
diff --git a/common-content/en/module/react/fetching-data-with-effects/index.md b/common-content/en/module/react/fetching-data-with-effects/index.md
index d96da9d82..7b3040b14 100644
--- a/common-content/en/module/react/fetching-data-with-effects/index.md
+++ b/common-content/en/module/react/fetching-data-with-effects/index.md
@@ -1,9 +1,9 @@
 +++
-title = "🐕 🎳 Fetching data with Effects"
+title = "Fetching data with Effects"
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🎳'
 [objectives]
     1='Fetch data from an API using the useEffect hook'
 [build]
diff --git a/common-content/en/module/react/fetching-data/index.md b/common-content/en/module/react/fetching-data/index.md
index 6e01ff46c..16a45a5bd 100644
--- a/common-content/en/module/react/fetching-data/index.md
+++ b/common-content/en/module/react/fetching-data/index.md
@@ -1,9 +1,9 @@
 +++
-title = "🐕 Fetching data"
+title = "Fetching data"
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🐕'
 [objectives]
     1="Explain why fetch doesn't work in React"
 [build]
diff --git a/common-content/en/module/react/handling-events/index.md b/common-content/en/module/react/handling-events/index.md
index 7e2baf6a5..721d0e0d4 100644
--- a/common-content/en/module/react/handling-events/index.md
+++ b/common-content/en/module/react/handling-events/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🦻🏼 Handling events'
+title = 'Handling events'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '🦻🏼'
 [objectives]
     1='Add event handlers to your JSX'
 [build]
diff --git a/common-content/en/module/react/import-export/index.md b/common-content/en/module/react/import-export/index.md
index f50b27f16..783a242fa 100644
--- a/common-content/en/module/react/import-export/index.md
+++ b/common-content/en/module/react/import-export/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🚢 Importing and Exporting'
+title = 'Importing and Exporting'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🚢'
 [objectives]
     1='Export a React component'
     2='Import a React component'
diff --git a/common-content/en/module/react/jsx/index.md b/common-content/en/module/react/jsx/index.md
index 0e31214ff..6f42574c3 100644
--- a/common-content/en/module/react/jsx/index.md
+++ b/common-content/en/module/react/jsx/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🍬 JSX syntactic sugar'
+title = 'JSX syntactic sugar'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🍬'
 [objectives]
     1='Display information with JSX'
 [build]
diff --git a/common-content/en/module/react/keys/index.md b/common-content/en/module/react/keys/index.md
index d23bee8e9..b85468f10 100644
--- a/common-content/en/module/react/keys/index.md
+++ b/common-content/en/module/react/keys/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🔑 Keys'
+title = 'Keys'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🔑'
 [objectives]
     1='Explain why React needs keys'
 [build]
diff --git a/common-content/en/module/react/multiple-fields/index.md b/common-content/en/module/react/multiple-fields/index.md
index f71069bf4..19c5b3319 100644
--- a/common-content/en/module/react/multiple-fields/index.md
+++ b/common-content/en/module/react/multiple-fields/index.md
@@ -1,9 +1,9 @@
 +++
-title = "🗂️ Forms with multiple fields"
+title = "Forms with multiple fields"
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🗂️'
 [objectives]
     1='Handle multiple user inputs in a form'
     2='Use a single event handler for multiple inputs'
diff --git a/common-content/en/module/react/pokedex/index.md b/common-content/en/module/react/pokedex/index.md
index c196e4182..8f9320539 100644
--- a/common-content/en/module/react/pokedex/index.md
+++ b/common-content/en/module/react/pokedex/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📇 Pokedex'
+title = 'Pokedex'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '📇'
 [objectives]
     1='Use the Teach Tech Together guide to construct your objectives'
     2='Limit the objectives to 3-5 items'
diff --git a/common-content/en/module/react/props/index.md b/common-content/en/module/react/props/index.md
index 798103d5e..e4389bc4a 100644
--- a/common-content/en/module/react/props/index.md
+++ b/common-content/en/module/react/props/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📦 Props'
+title = 'Props'
 
 time = 15
 facilitation = false
-emoji= '🧩'
+emoji= '📦'
 [objectives]
     1='Pass props to a component'
     2='Read props from a component'
diff --git a/common-content/en/module/react/re-rendering/index.md b/common-content/en/module/react/re-rendering/index.md
index 680cfb4b1..482a27c9c 100644
--- a/common-content/en/module/react/re-rendering/index.md
+++ b/common-content/en/module/react/re-rendering/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪞 Re-Rendering'
+title = 'Re-Rendering'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🪞'
 [objectives]
     1='Write your first React component'
 [build]
diff --git a/common-content/en/module/react/react-router/index.md b/common-content/en/module/react/react-router/index.md
index 0c26add51..79a08c1b3 100644
--- a/common-content/en/module/react/react-router/index.md
+++ b/common-content/en/module/react/react-router/index.md
@@ -1,9 +1,9 @@
 +++
-title = "🚏 React Router"
+title = "React Router"
 
 time = 60
 facilitation = false
-emoji= '🧩'
+emoji= '🚏'
 [objectives]
     1='Define multiple routes in a React application'
 [build]
diff --git a/common-content/en/module/react/rendering/index.md b/common-content/en/module/react/rendering/index.md
index 5a6e0baaf..cb922d331 100644
--- a/common-content/en/module/react/rendering/index.md
+++ b/common-content/en/module/react/rendering/index.md
@@ -1,9 +1,9 @@
 +++
-title = "👨🏼‍🎨 Rendering"
+title = "Rendering"
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '👨🏼‍🎨 '
 [objectives]
     1='Use map() with React to transform an array of data into an array of components.'
 [build]
diff --git a/common-content/en/module/react/state/index.md b/common-content/en/module/react/state/index.md
index 4b9709f89..2f5d73463 100644
--- a/common-content/en/module/react/state/index.md
+++ b/common-content/en/module/react/state/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🚦 State'
+title = 'State'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🚦'
 [objectives]
     1='Add a state variable with the useState Hook'
 [build]
diff --git a/common-content/en/module/react/synchronizing-with-effects/index.md b/common-content/en/module/react/synchronizing-with-effects/index.md
index 653510c95..daeca39e7 100644
--- a/common-content/en/module/react/synchronizing-with-effects/index.md
+++ b/common-content/en/module/react/synchronizing-with-effects/index.md
@@ -1,9 +1,9 @@
 +++
-title = "🤹🏼 Synchronising with effects"
+title = "Synchronising with effects"
 
 time = 40
 facilitation = false
-emoji= '🧩'
+emoji= '🤹🏼'
 [objectives]
     1='Define the purpose of the useEffect hook in React'
     2='Describe the difference between effects and events in React'
diff --git a/common-content/en/module/react/team-project/index.md b/common-content/en/module/react/team-project/index.md
index e241d8d0a..1de4ad9b3 100644
--- a/common-content/en/module/react/team-project/index.md
+++ b/common-content/en/module/react/team-project/index.md
@@ -3,7 +3,7 @@ title = 'Team Project'
 
 time = 60
 facilitation = false
-emoji= '🧩'
+emoji= '🛗'
 [objectives]
     1='Work in a team to build a React app'
 [build]
diff --git a/common-content/en/module/react/vite/index.md b/common-content/en/module/react/vite/index.md
index 8a2287f80..b5a66de9a 100644
--- a/common-content/en/module/react/vite/index.md
+++ b/common-content/en/module/react/vite/index.md
@@ -3,7 +3,7 @@ title = 'Vite'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🏃‍♀️'
 [objectives]
     1='Create a new React app with Vite'
     2='Run the app in development mode'
diff --git a/common-content/en/module/react/what-is-react/index.md b/common-content/en/module/react/what-is-react/index.md
index 69a4015e1..c5a279f87 100644
--- a/common-content/en/module/react/what-is-react/index.md
+++ b/common-content/en/module/react/what-is-react/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🪄 What is React'
+title = 'What is React'
 
 time = 5
 facilitation = false
-emoji= '🧩'
+emoji= '🪄'
 [objectives]
     1='Find the docs'
     2='Describe the key principles of React'
diff --git a/common-content/en/module/react/working-with-forms/index.md b/common-content/en/module/react/working-with-forms/index.md
index 23ac2d4fc..38ede2969 100644
--- a/common-content/en/module/react/working-with-forms/index.md
+++ b/common-content/en/module/react/working-with-forms/index.md
@@ -1,9 +1,9 @@
 +++
-title = "📋 Working with forms"
+title = "Working with forms"
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '🔢'
 [objectives]
     1='Define controlled components'
 [build]
diff --git a/common-content/en/module/servers/building-the-server/index.md b/common-content/en/module/servers/building-the-server/index.md
index 0a3d6cfbd..e79d34c4e 100644
--- a/common-content/en/module/servers/building-the-server/index.md
+++ b/common-content/en/module/servers/building-the-server/index.md
@@ -3,7 +3,7 @@ title = 'Building the server'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🏗️'
 [objectives]
     1='Import the Express package in a file'
 [build]
diff --git a/common-content/en/module/servers/communicating-with-the-server/index.md b/common-content/en/module/servers/communicating-with-the-server/index.md
index 59f8e9708..50b5b2973 100644
--- a/common-content/en/module/servers/communicating-with-the-server/index.md
+++ b/common-content/en/module/servers/communicating-with-the-server/index.md
@@ -3,7 +3,7 @@ title = 'Communicating with the server'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '📮'
 [objectives]
     1='Define a handler function'
     2='Inspect the request and response objects in console'
diff --git a/common-content/en/module/servers/crud-2/index.md b/common-content/en/module/servers/crud-2/index.md
index 5416cd6f6..a3eecebbe 100644
--- a/common-content/en/module/servers/crud-2/index.md
+++ b/common-content/en/module/servers/crud-2/index.md
@@ -3,7 +3,7 @@ title = 'CRUD Again'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🎒'
 [objectives]
     1='Define CRUD'
 [build]
diff --git a/common-content/en/module/servers/crud-challenges/index.md b/common-content/en/module/servers/crud-challenges/index.md
index 2c962599d..91734a229 100644
--- a/common-content/en/module/servers/crud-challenges/index.md
+++ b/common-content/en/module/servers/crud-challenges/index.md
@@ -1,9 +1,9 @@
 +++
-title = '💪🏾 CRUD Challenges'
+title = 'CRUD Challenges'
 
 time = 45
 facilitation = false
-emoji= '🧩'
+emoji= '💪🏾'
 [build]
   render = 'never'
   list = 'local'
diff --git a/common-content/en/module/servers/crud/index.md b/common-content/en/module/servers/crud/index.md
index 29b34379f..f5773b35b 100644
--- a/common-content/en/module/servers/crud/index.md
+++ b/common-content/en/module/servers/crud/index.md
@@ -3,7 +3,7 @@ title = 'CRUD'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🎒'
 [objectives]
     1='Define CRUD'
 [build]
diff --git a/common-content/en/module/servers/get-single/index.md b/common-content/en/module/servers/get-single/index.md
index fcebfd01f..6a9880c02 100644
--- a/common-content/en/module/servers/get-single/index.md
+++ b/common-content/en/module/servers/get-single/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🐕 GET single movie'
+title = 'GET single movie'
 
 time = 10
 facilitation = false
-emoji= '🧩'
+emoji= '🐕'
 [objectives]
     1='Use GET to match a specific query parameter'
 [build]
diff --git a/common-content/en/module/servers/get/index.md b/common-content/en/module/servers/get/index.md
index 2466d9eaf..fbfc3f79b 100644
--- a/common-content/en/module/servers/get/index.md
+++ b/common-content/en/module/servers/get/index.md
@@ -1,9 +1,9 @@
 +++
-title = '🐕 GET'
+title = 'GET'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🐕'
 [objectives]
     1='Process a GET request using Express and Node to retrieve data from memory'
 [build]
diff --git a/common-content/en/module/servers/intro-to-express/index.md b/common-content/en/module/servers/intro-to-express/index.md
index 4dfbfb092..4992a763f 100644
--- a/common-content/en/module/servers/intro-to-express/index.md
+++ b/common-content/en/module/servers/intro-to-express/index.md
@@ -3,7 +3,7 @@ title = 'Introduction to Express'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🚀'
 [objectives]
     1='Create an Express server'
 [build]
diff --git a/common-content/en/module/servers/make-a-node-project/index.md b/common-content/en/module/servers/make-a-node-project/index.md
index c9fe566b4..fc61155b6 100644
--- a/common-content/en/module/servers/make-a-node-project/index.md
+++ b/common-content/en/module/servers/make-a-node-project/index.md
@@ -3,7 +3,7 @@ title = 'Make a Node Project'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🧰'
 [objectives]
     1='Create a new repo from scratch'
     2='Initialize a Node project'
diff --git a/common-content/en/module/servers/post/index.md b/common-content/en/module/servers/post/index.md
index c54f0d0b5..939f04ef7 100644
--- a/common-content/en/module/servers/post/index.md
+++ b/common-content/en/module/servers/post/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📨 POST'
+title = 'POST'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '📨'
 [objectives]
     1='Process a POST request using Express and Node and store data in memory'
 [build]
diff --git a/common-content/en/module/servers/postman/index.md b/common-content/en/module/servers/postman/index.md
index abc7b370a..d76e6f4c0 100644
--- a/common-content/en/module/servers/postman/index.md
+++ b/common-content/en/module/servers/postman/index.md
@@ -3,7 +3,7 @@ title = 'Install Postman'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '📮'
 [objectives]
     1='Install Postman'
 [build]
diff --git a/common-content/en/module/servers/put/index.md b/common-content/en/module/servers/put/index.md
index 476aa55bb..0ae1c0ef6 100644
--- a/common-content/en/module/servers/put/index.md
+++ b/common-content/en/module/servers/put/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📨 PUT'
+title = 'PUT'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '📨'
 [objectives]
     1='Process a PUT request using Express and Node and update an array held in memory'
 [build]
diff --git a/common-content/en/module/servers/query-parameters/index.md b/common-content/en/module/servers/query-parameters/index.md
index a7c5194fe..57e3f53b9 100644
--- a/common-content/en/module/servers/query-parameters/index.md
+++ b/common-content/en/module/servers/query-parameters/index.md
@@ -3,7 +3,7 @@ title = 'Query Parameters'
 
 time = 20
 facilitation = false
-emoji= '🧩'
+emoji= '❓'
 [objectives]
     1='Identify a query parameter in a URL'
     2='Write code that responds to a query parameter'
diff --git a/common-content/en/module/servers/render/index.md b/common-content/en/module/servers/render/index.md
index 995471734..da29bf3c3 100644
--- a/common-content/en/module/servers/render/index.md
+++ b/common-content/en/module/servers/render/index.md
@@ -3,7 +3,7 @@ title = 'Set up Render'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🧰'
 [objectives]
     1='Set up Render'
 [build]
diff --git a/common-content/en/module/servers/routing/index.md b/common-content/en/module/servers/routing/index.md
index f89615819..643a19fee 100644
--- a/common-content/en/module/servers/routing/index.md
+++ b/common-content/en/module/servers/routing/index.md
@@ -3,7 +3,7 @@ title = 'Routing'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '🛤️'
 [objectives]
     1='Identify the endpoint in a URL'
     2='Define two endpoints in Express'
diff --git a/common-content/en/module/servers/test-examples-in-postman/index.md b/common-content/en/module/servers/test-examples-in-postman/index.md
index 9d38b2496..789408c0b 100644
--- a/common-content/en/module/servers/test-examples-in-postman/index.md
+++ b/common-content/en/module/servers/test-examples-in-postman/index.md
@@ -1,9 +1,9 @@
 +++
-title = '📮 🧪 Test Examples in Postman'
+title = 'Test Examples in Postman'
 
 time = 30
 facilitation = false
-emoji= '🧩'
+emoji= '📮🧪'
 [objectives]
     1='Fork a Postman workspace'
     2='Run a request in Postman'
diff --git a/common-content/en/module/the-launch/readme/index.md b/common-content/en/module/the-launch/readme/index.md
index ce3a45e1a..4f2eca240 100644
--- a/common-content/en/module/the-launch/readme/index.md
+++ b/common-content/en/module/the-launch/readme/index.md
@@ -1,5 +1,6 @@
 +++
 title="Prep your codebase"
+emoji="🚀"
 time=60
 hide_from_overview=true
 [build]
diff --git a/common-theme/layouts/_default/overview.html b/common-theme/layouts/_default/overview.html
index 0ab0cea06..19ae87d8f 100644
--- a/common-theme/layouts/_default/overview.html
+++ b/common-theme/layouts/_default/overview.html
@@ -67,7 +67,7 @@ <h4 class="c-overview__sprint e-heading__5">
                 {{ continue }}
               {{ end }}
               {{ $title := or .title $block.Title }}
-              <li>{{ $title }}</li>
+              <li>{{with $block.Params.emoji}}<span class="c-emoji">{{.}}</span>{{end}} {{ $title }}</li>
             {{ end }}
           </ol>
          {{end}}
diff --git a/common-theme/layouts/partials/block/local.html b/common-theme/layouts/partials/block/local.html
index 2ca2248de..cb1de522c 100644
--- a/common-theme/layouts/partials/block/local.html
+++ b/common-theme/layouts/partials/block/local.html
@@ -14,6 +14,9 @@
       <h2
         class="c-block__title e-heading__2"
         id="{{ $blockData.name |urlize }}">
+        {{ with $block.Params.emoji }}
+          <span class="c-emoji">{{ . }}</span>
+        {{ end }}
         {{ $block.Title }}
       </h2>
       {{ partial "time.html" . }}
diff --git a/common-theme/layouts/partials/block/readme.html b/common-theme/layouts/partials/block/readme.html
index 87e649077..3aaab2cff 100644
--- a/common-theme/layouts/partials/block/readme.html
+++ b/common-theme/layouts/partials/block/readme.html
@@ -22,7 +22,7 @@
       <h2
         class="c-block__title e-heading__2"
         id="{{ $blockData.name |urlize }}">
-        <a href="{{ $response.html_url }}">{{ $blockData.name }} 🔗</a>
+        <a href="{{ $response.html_url }}">🔗 {{ $blockData.name }}</a>
       </h2>
       {{ partial "time.html" $pageContext }}
     </header>
diff --git a/common-theme/layouts/partials/block/slide.html b/common-theme/layouts/partials/block/slide.html
index 15c4c654b..529e58f3a 100644
--- a/common-theme/layouts/partials/block/slide.html
+++ b/common-theme/layouts/partials/block/slide.html
@@ -4,7 +4,7 @@
   aria-labelledby="{{ $blockData.name |urlize }}">
   {{ if not $blockData.isShortcode }}
     <h2 class="c-block__title e-heading__2" id="{{ $blockData.name |urlize }}">
-      <a href="{{ $blockData.sot }}">{{ $blockData.name }} 🔗</a>
+      <a href="{{ $blockData.sot }}">🔗 {{ $blockData.name }}</a>
     </h2>
   {{ end }}
   <div class="c-block__content">
diff --git a/common-theme/layouts/partials/block/youtube.html b/common-theme/layouts/partials/block/youtube.html
index 4d107ef42..3eaf09825 100644
--- a/common-theme/layouts/partials/block/youtube.html
+++ b/common-theme/layouts/partials/block/youtube.html
@@ -7,7 +7,7 @@
       class="c-block__title e-heading__2 is-invisible"
       id="{{ $blockData.name |urlize }}">
       Youtube:
-      <a href="{{ $blockData.sot }}">{{ $blockData.name }} 🔗</a>
+      <a href="{{ $blockData.sot }}">{{ $blockData.name }}</a>
     </h2>
   {{ end }}
   <div class="c-block__content">
diff --git a/org-cyf-itd/content/blocks/how-itd-works/accessing-the-dashboard/index.md b/org-cyf-itd/content/blocks/how-itd-works/accessing-the-dashboard/index.md
index 55323f96c..a9b57506d 100644
--- a/org-cyf-itd/content/blocks/how-itd-works/accessing-the-dashboard/index.md
+++ b/org-cyf-itd/content/blocks/how-itd-works/accessing-the-dashboard/index.md
@@ -1,5 +1,6 @@
 +++
 title="Accessing the Dashboard"
+emoji="🪪"
 author="Tony Beaumont"
 description="How to access the dashboard"
 time=15
diff --git a/org-cyf-itd/content/blocks/how-itd-works/know-learn-need-do/index.md b/org-cyf-itd/content/blocks/how-itd-works/know-learn-need-do/index.md
index 5e6ef08b7..62412b78f 100644
--- a/org-cyf-itd/content/blocks/how-itd-works/know-learn-need-do/index.md
+++ b/org-cyf-itd/content/blocks/how-itd-works/know-learn-need-do/index.md
@@ -1,5 +1,6 @@
 +++
 title="What you know, what you will learn"
+emoji="🧑🏼‍🎓"
 author="Tony Beaumont"
 time=10
 +++
diff --git a/org-cyf-itd/content/blocks/how-itd-works/reviewing/index.md b/org-cyf-itd/content/blocks/how-itd-works/reviewing/index.md
index 13d23de4c..5e22306cc 100644
--- a/org-cyf-itd/content/blocks/how-itd-works/reviewing/index.md
+++ b/org-cyf-itd/content/blocks/how-itd-works/reviewing/index.md
@@ -1,5 +1,6 @@
 +++
 title="Reviewing"
+emoji="🔍"
 author="Tony Beaumont"
 time=10
 +++
diff --git a/org-cyf-itd/content/blocks/how-itd-works/useful-links/index.md b/org-cyf-itd/content/blocks/how-itd-works/useful-links/index.md
index c1e081699..bf5d30e42 100644
--- a/org-cyf-itd/content/blocks/how-itd-works/useful-links/index.md
+++ b/org-cyf-itd/content/blocks/how-itd-works/useful-links/index.md
@@ -1,5 +1,6 @@
 +++
 title="Useful links"
+emoji="🔗"
 author="Tony Beaumont"
 time=2
 +++
diff --git a/org-cyf-itd/content/blocks/how-itd-works/using-the-curriculum/index.md b/org-cyf-itd/content/blocks/how-itd-works/using-the-curriculum/index.md
index aa6c30474..60290923c 100644
--- a/org-cyf-itd/content/blocks/how-itd-works/using-the-curriculum/index.md
+++ b/org-cyf-itd/content/blocks/how-itd-works/using-the-curriculum/index.md
@@ -1,5 +1,6 @@
 +++
 title="Using the ITD Curriculum"
+emoji="📚"
 author="Tony Beaumont"
 time=5
 +++
@@ -10,9 +11,9 @@ Before you can review the work submitted by applicants, you should familiarise y
 
 This is the ITD syllabus.
 
-Applicants will work through the steps week by week. Each step contains instructions for the applicants to do complete a task which they should then submit. Volunteers can find these submissions on the dashboard and give feedback. 
+Applicants will work through the steps week by week. Each step contains instructions for the applicants to do complete a task which they should then submit. Volunteers can find these submissions on the dashboard and give feedback.
 
-Tip: You can read all the steps right here in the menu ["Steps"](https://itd.codeyourfuture.io/). 
+Tip: You can read all the steps right here in the menu ["Steps"](https://itd.codeyourfuture.io/).
 
 The Workshops will be organised by each region, and are designed to be face-to-face opportunities for applicants to ask questions and clarify their learning. Workshops will be advertised on Eventbrite and advertised in Slack.
 
diff --git a/org-cyf-itd/content/blocks/how-itd-works/using-the-dashboard/index.md b/org-cyf-itd/content/blocks/how-itd-works/using-the-dashboard/index.md
index 33b6cdb21..59248daae 100644
--- a/org-cyf-itd/content/blocks/how-itd-works/using-the-dashboard/index.md
+++ b/org-cyf-itd/content/blocks/how-itd-works/using-the-dashboard/index.md
@@ -1,5 +1,6 @@
 +++
 title="Using the CYF Dashboard"
+emoji="🪟"
 author="Tony Beaumont"
 time=15
 +++
diff --git a/org-cyf-itd/content/blocks/how-itd-works/welcome/index.md b/org-cyf-itd/content/blocks/how-itd-works/welcome/index.md
index bc899b81b..8926412e2 100644
--- a/org-cyf-itd/content/blocks/how-itd-works/welcome/index.md
+++ b/org-cyf-itd/content/blocks/how-itd-works/welcome/index.md
@@ -1,5 +1,6 @@
 +++
 title="Welcome to new ITD Volunteers"
+emoji="👋"
 author="Tony Beaumont"
 time=2
 +++
diff --git a/org-cyf-itd/content/blocks/mentor-led/index.md b/org-cyf-itd/content/blocks/mentor-led/index.md
index ef47f5819..2edf4d9b2 100644
--- a/org-cyf-itd/content/blocks/mentor-led/index.md
+++ b/org-cyf-itd/content/blocks/mentor-led/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🧰 Mentor Led Workshop '
+title = 'Mentor Led Workshop '
 time = 45
 emoji= '🧰'
 objectives =['Work together on exercises and activities to find gaps in understanding','Describe and resolve mental model errors']
diff --git a/org-cyf-itd/content/blocks/peer-learning/index.md b/org-cyf-itd/content/blocks/peer-learning/index.md
index 4e28fb010..70b3e619a 100644
--- a/org-cyf-itd/content/blocks/peer-learning/index.md
+++ b/org-cyf-itd/content/blocks/peer-learning/index.md
@@ -1,5 +1,5 @@
 +++
-title = '🧰 Peer learning Workshop '
+title = 'Peer learning Workshop '
 time = 30
 emoji= '🧰'
 objectives =['Work together on exercises and activities to find gaps in understanding','Describe and resolve mental model errors']