diff --git a/content/_index.md b/content/_index.md
index 6e783c4..acc36a3 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -41,17 +41,17 @@ We collect here the exercise groups that we know:
 - ...
 
 
-## Recording and broadcasting
+## Outreach
 
 - ...
 
 
-## Outreach
+## Recording and broadcasting
 
 - ...
 
 
-## Expert helpers
+## Local organizers
 
 - ...
 
diff --git a/content/certificates.md b/content/certificates.md
index daae126..0cc9feb 100644
--- a/content/certificates.md
+++ b/content/certificates.md
@@ -14,13 +14,14 @@ registered in Aalto systems.  Please note that this does not apply to
 participants affiliated with TU Delft or other universities who have own
 criteria for workshop certificates and credits.
 
-To obtain a certificate, we expect you to **follow the 6 days** of the course and
-provide us with the following **three documents via email**:
+To obtain a certificate, you must be affiliated with a university, or similar
+research organisation. We expect you to **follow the 6 days** of the course and
+provide us with the following **three text documents sent from your university email**:
 
-1. The output of `git log --all` from the repositories that you have used
-   during the course as a text file. Evaluation criteria: we expect to see the
-   results from most of the git commands that are run in the first 3 days of
-   the workshop.
+1. A document that shows that you did the exercises during the course. *Note: if you are planning to delete the exercise repository from your GitHub projects, instead of sending links to your work you can send PDF screenshots e.g. by doing "print to PDF" with your browser.*
+   - Write one or more paragraphs about [Day 1 - Exercise 2](https://coderefinery.github.io/git-intro/commits/#exercise): provide the link to the forked repository on your GitHub account and show that you did new commits. If you did not use GitHub and if you used the command line, then provide the output of the command `git log --all` for the forked repository. Explain what you did. 
+   - Write one or more paragraphs about [Day 2 - Exercise 3](https://coderefinery.github.io/git-intro/sharing/#exercise): provide the link to the new repository you have created on your GitHub account. If you did not use GitHub and if you used the command line, then provide the output of the command `git log --all` for the newly created repository. Explain what you did.
+   - Write one or more paragraphs about [Day 3 - Exercise 1](https://coderefinery.github.io/git-collaborative/same-repository/#exercise): provide the link to the pull request. Explain what you did.
 2. Written answers to the following four questions submitted as a document (pdf
    or word or txt). Evaluation criteria: we expect critical answers related to
    the content of first 3 days with both pros and cons (when relevant):
@@ -36,3 +37,5 @@ provide us with the following **three documents via email**:
 
 During the workshop we will provide with contact addresses where you should
 send these documents to.
+
+As this is a very simple homework, the use of generative AI (like ChatGPT) is not allowed. We also have access to ChatGPT and we know how to write prompts that can generate the answers to these homework, so it is very easy for us to check when AI was used. Submissions suspected of being generated by AI will be rejected.
diff --git a/content/communication/2024-03-01-team-leaders-without-groups.md b/content/communication/2024-03-01-team-leaders-without-groups.md
new file mode 100644
index 0000000..7bab306
--- /dev/null
+++ b/content/communication/2024-03-01-team-leaders-without-groups.md
@@ -0,0 +1,27 @@
++++
+title = "2024-03-01 Practical info for team leaders without own groups"
+[extra]
+subject = "CodeRefinery workshop: practical info for team leaders"
++++
+
+Dear all,
+
+You have indicated that you might want to help out as team leader but don't have a team yet.
+Thank you for your interest in helping the CodeRefinery to become an educational experience for everyone!
+
+This time, we do not provide a central exercise Zoom for learners and team leaders without own groups.
+However, you can still support the workshop and here are few options:
+
+- Be available for questions. During the workshop we will use a collaborative document for asynchronous Q&A, you can help by answering questions there and keeping things organized.
+- Gather colleagues and organize a (virtual) room to watch the workshop stream together and discuss the exercises of week 1. You can also organize additional exercise or help sessions around the workshop.
+- Advertise the workshop in your networks. Let us know if we can help by providing texts or so.
+
+In any case you are welcome to attend our team leader onboarding session, to get to know about the different options:
+- Zoom link: (URL)
+- Schedule: https://coderefinery.github.io/2024-03-12-workshop/#schedule
+
+If you have any questions, please write to me or support@coderefinery.org.
+
+Thank you,
+
+Radovan and the CodeRefinery team
diff --git a/content/communication/2024-03-01-team-leaders.md b/content/communication/2024-03-01-team-leaders.md
new file mode 100644
index 0000000..0262662
--- /dev/null
+++ b/content/communication/2024-03-01-team-leaders.md
@@ -0,0 +1,69 @@
++++
+title = "2024-03-01 Practical info for team leaders and local organizers"
+[extra]
+subject = "CodeRefinery workshop: practical info for team leaders and local organizers"
++++
+
+Dear all,
+
+
+**Summary**
+
+Thanks for being a team leader/ local organizer! 
+
+Please join one of our onboarding sessions about being a team leader:
+- Zoom link: (URL)
+- Schedule: https://coderefinery.github.io/2024-03-12-workshop/#schedule
+
+We are working on simplifying install instructions (please wait with those).
+
+We plan to send an email to all registrants next week Tuesday.
+
+The are currently reworking the Git lessons for week 1 to reflect more how people work with Git today. 
+
+
+**Thank you**
+
+First of all: Thanks so much for doing this! It's the teams and team leaders that make this workshop really work. We really appreciate!
+
+
+**What to expect**
+
+Expect a dynamic, exciting first week with lots of hands-on activities. Week 2 will be calmer, as we try a new route, providing exercise walk-throughs on stream and leaving it up to groups and individuals to play around on their own time. We suggest to meet in teams for week 1. If your group prefers to go through week 2 exercises, then we recommend to schedule your own sessions for that.
+
+
+**How to prepare to lead a team**
+
+Some hints on being a team leader
+
+Do you want to be active or to be around?
+
+- If active: You'll need to take the lead in discussions. You don't have to discuss the active material: you could make the discussions about your own work (our material will be there later anyway).
+- If "be around": During exercise sessions and other times, you can ask how it's going and take questions there. If it's too quiet, ask someone to screen-share and everyone else to say what to do.
+
+Be kind and considerate to everyone. Not everyone has to learn or do the same things. Don't make people feel bad for not doing as much as others, it's only natural!
+
+Don't worry! Take the first day to see how it works and then adapt based on what your group would like.
+
+It can be very hard to get people to talk sometimes. You can try this: Ask someone to screen-share (or you can). The person screen-sharing doesn't figure out what to do, but others tell them what to do. You can even make any exercises group-based this way.
+
+If you meet in-person and have a large screen to share: Twitch stream on one half, Notes on the other half.
+
+
+**Onboarding session**
+
+We provide 4 sessions for onboarding of team leaders next week. Please join one of them to learn about the workshop format and ask any questions you may have. The zoom link is the on top of the email.
+
+
+**Materials to read**
+
+One-page summary with tips and tricks: https://coderefinery.github.io/manuals/team-leaders/
+
+
+**Questions?**
+
+If you have any questions, please write to support@coderefinery.org.
+
+Thank you,
+
+Radovan and the CodeRefinery team
diff --git a/content/communication/2024-03-05-practical-info.md b/content/communication/2024-03-05-practical-info.md
new file mode 100644
index 0000000..01da5b7
--- /dev/null
+++ b/content/communication/2024-03-05-practical-info.md
@@ -0,0 +1,40 @@
++++
+title = "2024-03-05 Practical information one week before the workshop"
+[extra]
+subject = "[CodeRefinery workshop] practical information"
++++
+
+Dear {first_name},
+
+We are one week away from the CodeRefinery workshop. Exciting!
+
+Everybody, please install required software before the workshop (we made it a lot easier this time):
+- https://coderefinery.github.io/installation/
+- We offer two install help sessions (today and in two days; Tue and Thu): (URL shared with registrants)
+- Schedule in your time zone: https://coderefinery.github.io/2024-03-12-workshop/#schedule
+
+If you are a team leader or organize a local classroom, please come to one of our on-boarding sessions:
+- https://coderefinery.github.io/2024-03-12-workshop/#schedule
+- Zoom link for on-boarding sessions: (URL shared with registrants)
+
+
+**For all workshop participants**, here are all relevant resources that you need to connect:
+
+You can follow the workshop lectures via Twitch in a web browser, no account needed:
+- https://twitch.tv/coderefinery
+
+Please use this collaborative document to ask questions during the workshop:
+- (URL shared with registrants)
+
+Schedule and lecture material:
+- https://coderefinery.github.io/2024-03-12-workshop/#schedule
+- Each day we will take a break for lunch, which we have done our best to schedule at a time that will work for most locations as we are across multiple time zones.
+- We are still working on updating the Git lessons. This time we plan to work more in the browser and editor and less in the terminal.
+
+
+If you have any questions, please write to support@coderefinery.org or reply to me.
+
+
+Best regards,
+
+Radovan and the CodeRefinery team
diff --git a/content/communication/2024-03-10-practical-info2.md b/content/communication/2024-03-10-practical-info2.md
new file mode 100644
index 0000000..f2ae94a
--- /dev/null
+++ b/content/communication/2024-03-10-practical-info2.md
@@ -0,0 +1,31 @@
++++
+title = "2024-03-10 Practical information one day before the workshop"
+[extra]
+subject = "[CodeRefinery workshop] practical information"
++++
+
+Dear {first_name},
+
+The CodeRefinery workshop starts on Tuesday!
+
+We expect a dynamic and exciting workshop and very much look forward to it.
+Below are all relevant resources that you need to connect.
+
+You can follow the workshop lectures via Twitch in a web browser, no account needed:
+- https://twitch.tv/coderefinery
+
+Please use this collaborative document to ask questions during the workshop:
+- (URL shared with registrants)
+
+Schedule and lecture material:
+- https://coderefinery.github.io/2024-03-12-workshop/#schedule (in your local time zone)
+- Each day we will take a break for lunch, which we have done our best to schedule at a time that will work for most locations as we are across multiple time zones.
+
+Please install required software before the workshop:
+- https://coderefinery.github.io/installation/
+
+If you have any questions, please write to support@coderefinery.org or reply to me.
+
+Best regards,
+
+Radovan and the CodeRefinery team
diff --git a/content/communication/2024-03-12-exercise-preparation.md b/content/communication/2024-03-12-exercise-preparation.md
new file mode 100644
index 0000000..17f9198
--- /dev/null
+++ b/content/communication/2024-03-12-exercise-preparation.md
@@ -0,0 +1,24 @@
++++
+title = "2024-03-12 Exercise preparation for learners without own group"
+[extra]
+subject = "[CodeRefinery workshop] preparation for Thursday for leaners without own group"
++++
+
+Dear {first_name},
+
+This email is only relevant if you plan to participate in the CodeRefinery workshop this Thursday as individual learner and are not part of a team or a local exercise group.
+
+On Thursday we will all practice how to collaborate using Git/GitHub and one ambitious thing we will try is to collaborate with participants following via stream.
+
+If you would like to participate as individual learner in the collaborative exercises, please request access by opening an issue at https://github.com/cr-workshop-exercises/access-requests/issues/new/choose (There click "Get started" -> "Submit new issue")
+
+This way we will know your GitHub username and give you write access to exercise repositories.
+
+After we add you as collaborator, you will get an email from GitHub.
+- Please accept the invitation
+- Don't forget to "unwatch" both https://github.com/cr-workshop-exercises/centralized-workflow-exercise and https://github.com/cr-workshop-exercises/centralized-workflow-exercise-recorded to make sure you don't get too many emails during the exercise.
+- To "unwatch", go to the repository and click the "Unwatch" button (top middle of the screen) and then select "Participating and @mentions".
+
+Best regards,
+
+Radovan and the CodeRefinery team
diff --git a/content/communication/2024-03-18-week2-prep.md b/content/communication/2024-03-18-week2-prep.md
new file mode 100644
index 0000000..ab4bbb6
--- /dev/null
+++ b/content/communication/2024-03-18-week2-prep.md
@@ -0,0 +1,36 @@
++++
+title = "2024-03-18 Welcome to week 2"
+[extra]
+subject = "[CodeRefinery workshop] welcome to week 2"
++++
+
+Dear {first_name},
+
+Thank you for joining the workshop last week, and for all the wonderful questions we got from you!
+For those who join us now for the second week only, welcome!
+- All questions and answers are archived: https://coderefinery.github.io/2024-03-12-workshop/questions/
+- Video recordings are published: https://www.youtube.com/watch?v=9eUUd40HkYI&list=PLpLblYHCzJADIsbUhXSrC0qW5wDsH-F9U
+
+We hope you got some good practice and understanding on how to collaborate using Git/GitHub and our trial of collaborating with you from the stream worked out for you! If you have suggestions on how to improve our lessons, please open issues or send pull requests:
+- https://github.com/coderefinery/git-intro
+- https://github.com/coderefinery/git-collaborative
+
+
+This week will be a little more diverse!
+
+We will take a peek into six topics that are all related to FAIR research software development:
+
+Tuesday will start with an overview of how all CodeRefinery lessons fit together under the umbrella of reproducible research and what steps you can take now already to make your research more reproducible. In the afternoon we will look into licenses, how they work and why you might want to care even when "only writing a small script for myself".
+
+Wednesday morning we look at different ways of how to document research code. From small projects with good README files to external documentation on Read the Docs. In the afternoon we will show some tips and tricks around Jupyter notebooks and how they can be used also outside of courses.
+
+Thursday we step a little deeper into software development practices by giving you an introduction into automated testing and how this could benefit you and your collaborators. The workshop ends with some live coding to showcase how to make code more reusable by caring about modularity.
+
+In contrast to week 1, there will not be any dedicated exercise times in week 2. Instead, instructors will demo things and discuss with you using the collaborative document. If you want, you can of course try to follow the demos or try to do them on your own time after the workshop. For this, you will need to install some tools which you can find at: https://coderefinery.github.io/installation/.
+
+We hope to see you again this week with the first session starting Tuesday at 9:00 CET (10 EET). We will start the stream 10 minutes earlier: https://coderefinery.github.io/2024-03-12-workshop/#schedule
+
+
+Best regards,
+
+CodeRefinery team
diff --git a/content/communication/announcement-long.md b/content/communication/announcement-long.md
index 92c2442..1c9567c 100644
--- a/content/communication/announcement-long.md
+++ b/content/communication/announcement-long.md
@@ -1,14 +1,14 @@
 +++
 title = "Workshop announcement example (longer version)"
 [extra]
-subject = "CodeRefinery Workshop announcement"
+subject = "CodeRefinery workshop announcement"
 +++
 
 Are you writing code and managing data for your research? Do you feel like
 wasting too much time on manual work? Do you struggle to understand and reuse older code?
 
 Join
-the CodeRefinery workshop
+the CodeRefinery workshop,
 **ADAPT DATES**,
 for free and online.
 
diff --git a/content/communication/announcement-short.md b/content/communication/announcement-short.md
index 32b927c..cf33255 100644
--- a/content/communication/announcement-short.md
+++ b/content/communication/announcement-short.md
@@ -1,12 +1,12 @@
 +++
 title = "Workshop announcement example (shorter version)"
 [extra]
-subject = "CodeRefinery Workshop announcement"
+subject = "CodeRefinery workshop announcement"
 +++
 
 CodeRefinery invites everyone interested in improving their software practice
 skills to join
-the CodeRefinery workshop
+the CodeRefinery workshop,
 **ADAPT DATES**,
 for free and online.
 
diff --git a/content/exercises.md b/content/exercises.md
index 33f6180..3a50594 100644
--- a/content/exercises.md
+++ b/content/exercises.md
@@ -4,72 +4,29 @@ title = "List of exercises"
 
 ## List of exercises
 
-We provide this list below to make it easier for team leaders to prepare and navigate
-lesson material.  We often change the material before each workshop and in this
-page we list also any ongoing or planned changes to avoid surprises.
+### Week 1
 
+Day 1:
+- [Copy and browse an existing project](https://coderefinery.github.io/git-intro/browsing/#exercise)
+- [Committing changes](https://coderefinery.github.io/git-intro/commits/#exercise)
+- [Merging changes and contributing to the project](https://coderefinery.github.io/git-intro/merging/#exercise)
 
-### Day 1 (Introduction to version control with Git)
+Day 2:
+- [Cloning a Git repository and working locally](https://coderefinery.github.io/git-intro/local-workflow/#exercise)
+- [Inspecting history](https://coderefinery.github.io/git-intro/archaeology/#exercise)
+- [How to turn your project to a Git repo and share it](https://coderefinery.github.io/git-intro/sharing/#exercise)
 
-- [Recording changes](https://coderefinery.github.io/git-intro/basics/#exercise-record-changes) (20 min).
-   - Record changes
-   - Optional exercises
-- [Optional exercises](https://coderefinery.github.io/git-intro/basics/#optional-exercises-comparing-changes) (20 min).
-   - One or all optional exercises
-- [Branching and merging](https://coderefinery.github.io/git-intro/branches/#exercise-create-and-commit-to-branches) (20 min).
-   - Branch-1
-   - Branch-2
-   - There are also optional exercises
+Day 3:
+- [Collaborating within the same repository](https://coderefinery.github.io/git-collaborative/same-repository/#exercise)
+- [Practicing code review](https://coderefinery.github.io/git-collaborative/code-review/#exercise)
+- [How to contribute changes to repositories that belong to others](https://coderefinery.github.io/git-collaborative/forking-workflow/#exercise)
 
 
-### Day 2 (Introduction to version control with Git)
+### Week 2
 
-- [Pushing to GitHub](https://coderefinery.github.io/git-intro/remotes/) (20 min).
-   - Set up SSH keys
-   - Pushing our guacamole recipe repository to GitHub
-   - Clone repository
-- [Inspecting history](https://coderefinery.github.io/git-intro/archaeology/) (30 min).
-   - History-1
-   - History-2 is optional
-- [Undoing and recovering](https://coderefinery.github.io/git-intro/recovering/) (25 min). We let participants/groups choose among:
-   - Undoing-1
-   - Undoing-2
-   - Undoing-3
+In week 2, the instructors will go through exercises on stream and invite
+learners to participate with questions using the collaborative document.
 
-
-### Day 3 (Collaborative distributed version control)
-
-- [Create a pull request](https://coderefinery.github.io/git-collaborative/centralized/#exercise-preparation) (30 min).
-  Creating a branch and commit, pushing the branch, creating a pull request, and reviewing pull requests.
-- [Working with forks](https://coderefinery.github.io/git-collaborative/distributed/#exercise-preparation) (30 min).
-
-
-### Day 4 (Reproducible research and Social coding and open software)
-
-- [Workflow-1 and Workflow-2](https://coderefinery.github.io/reproducible-research/workflow-management/#exercise) (25 min).
-- [Containers-1](https://coderefinery.github.io/reproducible-research/environments/#exercises) (20 min).
-- Rest is collaborative "discussion" in collaborative document and demo.
-- **Episode "Sharing code and data" will move to the "Social coding and open software" lesson**.
-- No individual/group exercise in the "Social coding and open software" part. We will all participate via collaborative document.
-  Nothing to prepare for team leaders.
-
-
-### Day 5 (How to document your research software and Jupyter notebooks)
-
-- [Writing good README files](https://coderefinery.github.io/documentation/writing-readme-files/) (20 min).
-   - README-1 or README-2 or README-3
-- [Sphinx and Markdown](https://coderefinery.github.io/documentation/sphinx/) and
-  [Deploying Sphinx documentation to GitHub Pages](https://coderefinery.github.io/documentation/gh_workflow/) (20 min).
-   - Sphinx-2
-   - Sphinx-3 (optional)
-   - GH-Pages-1
-- [First computational notebook](https://coderefinery.github.io/jupyter/first-notebook/#an-example-computational-notebook) (20 min).
-- [Sharing a notebook using Binder](https://coderefinery.github.io/jupyter/sharing/) (20 min).
-
-
-### Day 6 (Automated testing and Modular code development)
-
-- [Testing locally](https://coderefinery.github.io/testing/pytest/) (20 min).
-- [Test design](https://coderefinery.github.io/testing/test-design/) (20 min). We will add an end-to-end test exercise here as option.
-- No individual/group exercise in the "Modular code development" part. Learners will
-  participate all via collaborative document and ask and advice instructors.
+We will not switch between lectures and group exercise sessions in week 2.  For
+groups that wish to go through exercises on their own, we recommend to schedule
+separate sessions for this.
diff --git a/content/join.md b/content/join.md
index 92739e6..9ab3edf 100644
--- a/content/join.md
+++ b/content/join.md
@@ -4,9 +4,9 @@ template = "join.html"
 +++
 
 Anyone may watch the livestream (<https://twitch.tv/coderefinery>).
-You are free to attend just those days or sessions you want!  
-Read more about [how to attend a livestream course](https://coderefinery.github.io/manuals/how-to-attend-stream/) or [watch the video on YouTube!](https://youtu.be/QUAZELOioUY).
-Some partners host own video- or in-person exercise rooms. 
+You are free to attend just those days or sessions you want.
+Read more about [how to attend a livestream course](https://coderefinery.github.io/manuals/how-to-attend-stream/) or [watch the video on YouTube](https://youtu.be/QUAZELOioUY).
+Some partners host own video- or in-person exercise rooms.
 
 
 {{ div(attributes='class="uk-child-width-expand@m uk-margin-large-top" uk-grid') }}
@@ -20,23 +20,23 @@ The promise of the Internet is that we can reach everyone, so why
 don't we?  We teach on a Twitch livestream
 ([twitch.tv/coderefinery](https://twitch.tv/coderefinery)) so that
 anyone may attend the workshop.  With livestream attendance, you get:
-- access to all workshop content, text and video
-- lesson recordings released usually on the same day
-- a channel for questions (if you register)
-- to do exercises yourself, or in a self-organized group
+- Access to all workshop content, text and video
+- Lesson recordings released usually on the same day
+- A channel for questions (if you register)
+- To do exercises yourself, or in a self-organized group
 
 
 ### Attend with own team
 
 **We recommend that you form your own team and do exercises together in-person
-or online.** We will support this as much as we can!
+or online.** Especially for week 1. We will support this as much as we can.
 
 You can arrange everything with your friends and colleagues:
-- agree where to meet
-- agree how to follow the workshop
-- maybe have some communications channel for your team
-- we send all registrants all information about the workshop
-- we don't need to know the details, but let us know if you have a team (for reporting purposes)
+- Agree where to meet
+- Agree how to follow the workshop
+- Maybe have some communications channel for your team
+- We send all registrants all information about the workshop
+- We don't need to know the details, but let us know if you have a team (for reporting purposes)
 
 
 ### Attend in a local partner's event
@@ -67,7 +67,7 @@ Volunteer to be an **team leader** at CodeRefinery, and you will:
 
 **Am I good enough to be a team leader?**  If you are asking this
 question, probably you are. If you have some familiarity with
-Git, you can provide some initial advice on obvious error messages, 
+Git, you can provide some initial advice on obvious error messages,
 but the idea is that you are able to ask for advanced help when it's needed.
 
 **You don't have to be located in the Nordics**. We welcome volunteers from
@@ -79,16 +79,6 @@ us to reach more people.
 {{ div() }}
 
 
-### FAQ: how should I register?
-
-- **Our team will work together in a physical room, is there any point to joining the CodeRefinery Zoom?**
-  - No need. If you all get stuck in the exercises you can ask questions via the Q&A channel.
-    Note that some Zoom etc. can still be useful in the physical room for screen-sharing with each other.
-- **Does everyone on the team need to register?**
-  - Yes please. Then everyone gets information and connection details. Also we
-    are asked to report how many participants we have.
-
-
 ### Price and attendance priority policy
 
 The course is free of charge, funded by the [Nordic e-Infrastructure
diff --git a/content/links.md b/content/links.md
index 2ca2b96..c5b94b7 100644
--- a/content/links.md
+++ b/content/links.md
@@ -4,12 +4,11 @@
 ### Summary of important links
 
 - Watch the stream at [https://twitch.tv/coderefinery](https://twitch.tv/coderefinery) (shareable)
-- Links to lesson material in the schedule below (shareable)
-- Collaborative document for questions and notes (please register to receive it)
-- Q&A of each day is archived on [this site](@/questions/_index.md) (shareable)
 - [Archive of past communication to participants](@/communication/_index.md) (shareable)
-- Videos [on Twitch](https://www.twitch.tv/coderefinery/videos) for 7 days immediately
-  and [on YouTube](https://www.youtube.com/playlist?list=PLpLblYHCzJADyLxv8GRyxFiRJBhQ-G0NQ) later same day
-- [This cheatsheet is annotated with the topics of each
-  day](cheatsheet-annotated.pdf) (blue is day 1, red is day 2,
-  green is day 3).  The [original is here](https://aaltoscicomp.github.io/cheatsheets/git-the-way-you-need-it-cheatsheet.pdf).
+- Q&A of each day is archived on [this page](@/questions/_index.md) (shareable)
+- Videos [on Twitch](https://www.twitch.tv/coderefinery/videos) for 7 days
+  and [on
+  YouTube](https://www.youtube.com/playlist?list=PLpLblYHCzJADIsbUhXSrC0qW5wDsH-F9U) later
+- Install instructions: <https://coderefinery.github.io/installation/>
+- Lesson material is linked in the schedule below (shareable)
+- Collaborative document for questions and notes (please register to receive it)
diff --git a/content/requirements.md b/content/requirements.md
index 79f17fd..fd7ebd6 100644
--- a/content/requirements.md
+++ b/content/requirements.md
@@ -4,7 +4,8 @@ title = "Prerequisites and software requirements"
 
 ## Prerequisites
 
-- You should be able to navigate the file tree in a terminal session and edit
+- If you choose to participate using the command line, then you should be able
+  to navigate the file tree in a terminal session and edit
   text files in the terminal.
   [This Linux shell crash course](https://scicomp.aalto.fi/scicomp/shell/)
   ([video](https://youtu.be/56p6xX0aToI))
diff --git a/content/schedule.yaml b/content/schedule.yaml
index 5b182c3..ee1ecc3 100644
--- a/content/schedule.yaml
+++ b/content/schedule.yaml
@@ -2,138 +2,152 @@
 # all times must be input in UTC, be careful about daylight saving
 schedule:
   - title: "Installation help and on-boarding"
-    date: "2023-09-12"
+    date: "2024-03-05"
     sessions:
       - starts: 9:30
         ends: 10:30
-        title: On-boarding for team leaders leading groups over video
+        title: On-boarding for team leaders (option 1)
         url: https://coderefinery.github.io/manuals/team-leaders/
       - starts: 11:00
         ends: 12:00
-        title: On-boarding for team leaders leading in-person teams
+        title: On-boarding for team leaders (option 2)
         url: https://coderefinery.github.io/manuals/team-leaders/
       - starts: 12:30
         ends: 14:00
-        title: Installation help for everybody
+        title: Installation help for everybody (option 1)
         url: https://coderefinery.github.io/installation/
-  - title: "Installation help and on-boarding (you don't need to attend both days, choose the day that is better for you)"
-    date: "2023-09-13"
+  - title: "Installation help and on-boarding (you don't need to attend all sessions, choose the one that is better for you)"
+    date: "2024-03-07"
     sessions:
       - starts: 9:30
         ends: 10:30
-        title: On-boarding for team leaders leading groups over video
+        title: On-boarding for team leaders (option 3)
         url: https://coderefinery.github.io/manuals/team-leaders/
       - starts: 11:00
         ends: 12:00
-        title: On-boarding for team leaders leading in-person teams
+        title: On-boarding for team leaders (option 4)
         url: https://coderefinery.github.io/manuals/team-leaders/
       - starts: 12:30
         ends: 14:00
-        title: Installation help for everybody
+        title: Installation help for everybody (option 2)
         url: https://coderefinery.github.io/installation/
   - title: "Day 1"
-    date: "2023-09-19"
+    date: "2024-03-12"
     sessions:
-      - starts: 7:00
-        ends: 7:20
+      - starts: 8:00
+        ends: 8:20
         title: Welcome and introduction
         url: https://github.com/coderefinery/workshop-intro/blob/master/livestream.md
         presenters: TBA
-      - starts: 7:20
-        ends: 9:00
+      - starts: 8:20
+        ends: 10:00
         title: Introduction to version control with Git - part 1/4
-        subtitle: Why we want to track versions and how to go back in time to a working version
+        subtitle: "Why we want to track versions and how to go back in time to a working version: [Motivation](https://coderefinery.github.io/git-intro/motivation/), [Browsing](https://coderefinery.github.io/git-intro/browsing/), [Commiting](https://coderefinery.github.io/git-intro/commits/)"
         url: https://coderefinery.github.io/git-intro/
         presenters: TBA
-      - starts: 10:00
-        ends: 11:30
+      - starts: 11:00
+        ends: 12:30
         title: Introduction to version control with Git - part 2/4
         url: https://coderefinery.github.io/git-intro/
         presenters: TBA
+        subtitle: "[Merging](https://coderefinery.github.io/git-intro/merging/)"
   - title: "Day 2"
-    date: "2023-09-20"
+    date: "2024-03-13"
     sessions:
-      - starts: 7:00
-        ends: 9:00
+      - starts: 8:00
+        ends: 10:00
         title: Introduction to version control with Git - part 3/4
         url: https://coderefinery.github.io/git-intro/
         presenters: TBA
-      - starts: 10:00
-        ends: 11:30
+        subtitle: "[Day 2 intro](https://github.com/coderefinery/workshop-intro/blob/master/daily_intro.md), [Local work](https://coderefinery.github.io/git-intro/local-workflow/), [Inspecting history](https://coderefinery.github.io/git-intro/archaeology/)"
+      - starts: 11:00
+        ends: 12:30
         title: Introduction to version control with Git - part 4/4
         url: https://coderefinery.github.io/git-intro/
         presenters: TBA
+        subtitle: "[Sharing work](https://coderefinery.github.io/git-intro/sharing/)"
   - title: "Day 3"
-    date: "2023-09-21"
+    date: "2024-03-14"
     sessions:
-      - starts: 7:00
-        ends: 9:00
+      - starts: 8:00
+        ends: 10:00
         title: Collaborative distributed version control - part 1/2
         url: https://coderefinery.github.io/git-collaborative/
         presenters: TBA
-      - starts: 10:00
-        ends: 11:30
+        subtitle: >-
+          [Day 3
+          intro](https://github.com/coderefinery/workshop-intro/blob/master/daily_intro.md#welcome-to-day-3-of-the-coderefinery-workshop),
+          [Concepts](https://coderefinery.github.io/git-collaborative/concepts/),
+          [Same
+          repository](https://coderefinery.github.io/git-collaborative/same-repository/),
+          [Code
+          Review](https://coderefinery.github.io/git-collaborative/code-review/)
+      - starts: 11:00
+        ends: 12:30
         title: Collaborative distributed version control - part 2/2
         url: https://coderefinery.github.io/git-collaborative/
         presenters: TBA
+        subtitle: >-
+          [Contributing to others](https://coderefinery.github.io/git-collaborative/forking-workflow/)
+
   - title: "Day 4"
-    date: "2023-09-26"
+    date: "2024-03-19"
     sessions:
-      - starts: 7:00
-        ends: 9:00
+      - starts: 8:00
+        ends: 10:00
         title: Reproducible research
         subtitle: Preparing code to be usable by you and others in the future
         url: https://coderefinery.github.io/reproducible-research/
         presenters: TBA
-      - starts: 10:00
-        ends: 11:30
+      - starts: 11:00
+        ends: 12:30
         title: Social coding and open software
         subtitle: What can you do to get credit for your code and to allow reuse
         url: https://coderefinery.github.io/social-coding/
         presenters: TBA
   - title: "Day 5"
-    date: "2023-09-27"
+    date: "2024-03-20"
     sessions:
-      - starts: 7:00
-        ends: 9:00
+      - starts: 8:00
+        ends: 10:00
         title: How to document your research software
         url: https://coderefinery.github.io/documentation/
         presenters: TBA
-      - starts: 10:00
-        ends: 11:30
+      - starts: 11:00
+        ends: 12:30
         title: Jupyter notebooks
         subtitle: A tool to write and share executable notebooks and data visualization
         url: https://coderefinery.github.io/jupyter/
         presenters: TBA
   - title: "Day 6"
-    date: "2023-09-28"
+    date: "2024-03-21"
     sessions:
-      - starts: 7:00
-        ends: 9:00
+      - starts: 8:00
+        ends: 10:00
         title: Automated testing
         subtitle: Preventing yourself and others from breaking your functioning code
         url: https://coderefinery.github.io/testing/
         presenters: TBA
-      - starts: 10:00
-        ends: 11:30
+      - starts: 11:00
+        ends: 12:30
         title: Modular code development
         subtitle: Making reusing parts of your code easier
         url: https://coderefinery.github.io/modular-type-along/
         presenters: TBA
-      - starts: 11:30
-        ends: 12:00
+      - starts: 12:30
+        ends: 13:00
         title: "Concluding remarks, general Q&A, and where to go from here"
         url: https://github.com/coderefinery/workshop-outro/blob/master/README.md
         presenters: TBA
   - title: "Optional: Bring your own code session"
-    date: "2023-10-02"
+    date: "2024-03-26"
     sessions:
-      - starts: 13:00
-        ends: 14:30
-        title: Bring your own code and discuss and ask
+      - starts: 12:00
+        ends: 14:00
+        title: Bring your own code and discuss and ask; you can also join this session if you have not attended the workshop
   - title: "Optional: Bring your own code session"
-    date: "2023-10-09"
+    date: "2024-04-02"
     sessions:
-      - starts: 13:00
-        ends: 14:30
-        title: Bring your own code and discuss and ask
+      - starts: 11:00
+        ends: 13:00
+        title: Bring your own code and discuss and ask; you can also join this session if you have not attended the workshop
diff --git a/sass/style.scss b/sass/style.scss
index 9d61a70..0d85c07 100644
--- a/sass/style.scss
+++ b/sass/style.scss
@@ -16,7 +16,13 @@ $table-header-cell-color: #666666;
 @import "../uikit/src/scss/mixins-theme.scss";
 @import "../uikit/src/scss/uikit-theme.scss";
 
-@import url('https://fonts.googleapis.com/css2?family=Roboto&display=swap');
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(Roboto.ttf) format('truetype');
+}
 
 * {
     font-family: 'Roboto', sans-serif;
diff --git a/static/Roboto.ttf b/static/Roboto.ttf
new file mode 100644
index 0000000..3033308
Binary files /dev/null and b/static/Roboto.ttf differ
diff --git a/static/cheatsheet-annotated.pdf b/static/cheatsheet-annotated.pdf
deleted file mode 100644
index 6965c7f..0000000
Binary files a/static/cheatsheet-annotated.pdf and /dev/null differ
diff --git a/templates/base.html b/templates/base.html
index 5330663..4023d47 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,9 +8,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <!-- uikit -->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.18.0/dist/css/uikit.min.css">
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.18.0/dist/js/uikit.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.18.0/dist/js/uikit-icons.min.js"></script>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/uikit@3.19.2/dist/css/uikit.min.css">
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.19.2/dist/js/uikit.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/uikit@3.19.2/dist/js/uikit-icons.min.js"></script>
 
     <!-- time zone localization -->
     <script src="https://cdn.jsdelivr.net/npm/dayjs@1.11.7/dayjs.min.js" integrity="sha256-EfJOqCcshFS/2TxhArURu3Wn8b/XDA4fbPWKSwZ+1B8=" crossorigin="anonymous"></script>
diff --git a/templates/index.html b/templates/index.html
index 5c9e6d4..813cae9 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -17,10 +17,10 @@ <h1>{{ config.title }}</h1>
   <div class="uk-card uk-card-secondary uk-card-hover uk-card-body uk-light uk-margin-large-bottom">
     <div uk-grid>
       <div class="uk-width-expand@m">
-        {% include "links.html" %}
+        {% include "news.html" %}
       </div>
       <div class="uk-width-expand@m">
-        {% include "news.html" %}
+        {% include "links.html" %}
       </div>
     </div>
   </div>
diff --git a/templates/schedule.html b/templates/schedule.html
index 4642e11..023400a 100644
--- a/templates/schedule.html
+++ b/templates/schedule.html
@@ -49,12 +49,12 @@ <h2>Schedule</h2>
             {% endif %}
             {% if session.subtitle %}
               <div class="uk-text-small">
-                {{ session.subtitle }}
+                {{ session.subtitle | markdown(inline=true) | safe }}
               </div>
             {% endif %}
             {% if session.presenters %}
               <div class="uk-text-small">
-                Presenters: {{ session.presenters }}
+                Presenters: {{ session.presenters | markdown(inline=true) | safe }}
               </div>
             {% endif %}
           </td>
diff --git a/uikit b/uikit
index e570bac..6ac30f5 160000
--- a/uikit
+++ b/uikit
@@ -1 +1 @@
-Subproject commit e570bac780f90978975dfaeaf952a8d81050e552
+Subproject commit 6ac30f5c89cb5e5781749fecd7e7250a942b5251