diff --git a/app/src/main/res/values/exam.xml b/app/src/main/res/values/exam.xml
index 60b4c58e13..d54f714801 100644
--- a/app/src/main/res/values/exam.xml
+++ b/app/src/main/res/values/exam.xml
@@ -18,15 +18,15 @@
     <string name="offlineprofile_label">Topic: Offline Profile</string>
     <string name="offlineprofile_nsprofile">NS Profile can be used, but not configured.</string>
     <string name="offlineprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile</string>
-    <string name="pumpdisconnect_label">Question 13: Reasons for applying "Disconnect pump" in AndroidAPS</string>
+    <string name="pumpdisconnect_label">Question 14: Reasons for applying "Disconnect pump" in AndroidAPS</string>
     <string name="pumpdisconnect_whattodo">What should be done when disconnecting the pump?</string>
     <string name="pumpdisconnect_unnecessary">This is unnecessary as insulin will not be delivered if the pump is physically disconnected.</string>
     <string name="pumpdisconnect_missinginsulin">It prevents AndroidAPS from accounting for insulin that was not delivered whilst the pump is physically disconnected. </string>
     <string name="pumpdisconnect_notstop">It will not stop insulin delivery if the pump remains connected.</string>
     <string name="pumpdisconnect_openloop">It will send AndroidAPS into open loop mode.</string>
     <string name="pumpdisconnect_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings</string>
-    <string name="objectives_label">Question 16: AndroidAPS Settings</string>
-    <string name="objectives2_label">Question 17: AndroidAPS Settings</string>
+    <string name="objectives_label">Question 17: AndroidAPS Settings</string>
+    <string name="objectives2_label">Question 18: AndroidAPS Settings</string>
     <string name="objectives_howtosave">What are the best practices for backing up your settings?</string>
     <string name="objectives_notesettings">You do not need to export your settings provided that you make a note of them.</string>
     <string name="objectives_afterobjective">Export your settings after you finish completing an objective.</string>
@@ -46,14 +46,14 @@
     <string name="noisycgm_turnoffphone">Turn off the phone.</string>
     <string name="noisycgm_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data</string>
     <string name="noisycgm_checksmoothing">Verify that your CGM app smoothes BG data.</string>
-    <string name="exerciseprofile_label">Topic 8: Exercise and Profiles</string>
+    <string name="exerciseprofile_label">Question 13: Exercise and Profiles</string>
     <string name="exerciseprofile_whattodo">How can you use profiles to best help the system deal with aerobic exercise?</string>
     <string name="exerciseprofile_switchprofilebelow100">Do a profile switch to less than 100%.</string>
     <string name="exerciseprofile_switchprofileabove100">Do a profile switch to more than 100%. </string>
     <string name="exerciseprofile_leaveat100">Leave the profile set to 100%.</string>
     <string name="exerciseprofile_suspendloop">Suspend the loop.</string>
     <string name="exerciseprofile_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target</string>
-    <string name="exercise_label">Question 12: Exercise and Temporary Targets</string>
+    <string name="exercise_label">Question 14: Exercise and Temporary Targets</string>
     <string name="exercise_whattodo">How can you use temporary targets to best help the system deal with aerobic exercise?</string>
     <string name="exercise_settt">Set an activity blood glucose target starting a suitable time before beginning exercise.</string>
     <string name="exercise_setfinished">Set an activity blood glucose target after finishing exercise.</string>
@@ -93,7 +93,7 @@
     <string name="prerequisites2_internet">AndroidAPS requires an internet connection in order to run in closed loop.</string>
     <string name="prerequisites2_supportedcgm">A supported CGM and appropriate app to receive blood glucose values on the phone/device.</string>
     <string name="prerequisites2_hint1">https://androidaps.readthedocs.io/en/latest/EN/Module/module.html</string>
-    <string name="update_label">Question 18: Updating AndroidAPS</string>
+    <string name="update_label">Question 19: Updating AndroidAPS</string>
     <string name="whatistrue">Check all correct answers.</string>
     <string name="update_git">You need to have Git installed and configured on your computer.</string>
     <string name="update_asap">When updated versions of AndroidAPS are released, the earlier versions may be remotely limited after a specified time.</string>
@@ -101,7 +101,7 @@
     <string name="update_neverupdate">Never update if the system is working well.</string>
     <string name="update_askfriend">If you have difficulty building the apk, you can install an apk that has been built by a friend.</string>
     <string name="update_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch</string>
-    <string name="troubleshooting_label">Question 19: Troubleshooting</string>
+    <string name="troubleshooting_label">Question 20: Troubleshooting</string>
     <string name="troubleshooting_wheretoask">Where can you look for help with AndroidAPS?</string>
     <string name="troubleshooting_fb">You can ask for advice in the AndroidAPS Users Facebook group.</string>
     <string name="troubleshooting_wiki">You should read (and re-read) the AndroidAPS documentation.</string>
@@ -110,46 +110,46 @@
     <string name="troubleshooting_hint1">https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting</string>
     <string name="troubleshooting_hint2">https://www.facebook.com/groups/AndroidAPSUsers/</string>
     <string name="troubleshooting_hint3">https://gitter.im/MilosKozak/AndroidAPS</string>
-    <string name="insulin_label">Question 14: Insulin Plugins</string>
+    <string name="insulin_label">Question 15: Insulin Plugins</string>
     <string name="insulin_ultrarapid">Which insulin should you use with the Ultra-Rapid Oref plugin?</string>
     <string name="insulin_fiasp">Fiasp®</string>
     <string name="insulin_novorapid">NovoRapid®/Novolog®</string>
     <string name="insulin_humalog">Humalog®</string>
     <string name="insulin_actrapid">Actrapid®/Humalin R®/"regular" human insulin.</string>
     <string name="insulin_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin</string>
-    <string name="sensitivity_label">Question 15: Sensitivity Plugins</string>
+    <string name="sensitivity_label">Question 16: Sensitivity Plugins</string>
     <string name="sensitivity_which">Check all correct answers.</string>
     <string name="sensitivity_adjust">Sensitivity plugins allow AndroidAPS to adjust for temporary or short-lived changes in insulin sensitivity (for example hormonal changes or issues with absorption at the infusion site).</string>
     <string name="sensitivity_edit">Sensitivity plugins provide the user with suggested changes to basal rates, I:C ratios and ISF that can be used to edit profile.</string>
     <string name="sensitivity_cannula">Logging a cannula change will reset Autosens ratio back to 100%.</string>
     <string name="sensitivity_time">Some of the plugin options have configurable time ranges that can be set by the user.</string>
     <string name="sensitivity_hint1">https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html</string>
-    <string name="wrongcarbs_label">Topic 16: Carb Entry Errors</string>
+    <string name="wrongcarbs_label">Question 21: Carb Entry Errors</string>
     <string name="wrongcarbs_whattodo">What should you do if you’ve made an incorrect carb entry?</string>
     <string name="wrongcarbs_treatmentstab">Delete the incorrect entry in Treatments and enter the correct new carb value.</string>
     <string name="wrongcarbs_addinsulin">Bolus with insulin using the Insulin (bolus) button in Overview. </string>
     <string name="wrongcarbs_donothing">Do nothing – AndroidAPS will make the appropriate adjustments.</string>
     <string name="wrongcarbs_bolus">Bolus with insulin using the Insulin (bolus) button in Overview.</string>
-    <string name="wronginsulin_label">Question 20: Insulin delivery/entry errors</string>
+    <string name="wronginsulin_label">Question 22: Insulin delivery/entry errors</string>
     <string name="wronginsulin_whattodo">What should you do if you received less insulin than the pump history suggests e.g. due to an occlusion, a failed cannula or forgetting to reattach the pump after a shower? </string>
     <string name="wronginsulin_careportal">Delete insulin data from Nightscout Careportal to remove it from the pump history.</string>
     <string name="wronginsulin_bolus">Bolus the missing insulin using the Insulin button in Overview.</string>
     <string name="wronginsulin_prime">Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime.</string>
     <string name="wronginsulin_donothing">Do nothing and allow AndroidAPS to correct any resulting high blood glucose level.</string>
-    <string name="iob_label">Question 21: Insulin on Board (IOB)</string>
+    <string name="iob_label">Question 23: Insulin on Board (IOB)</string>
     <string name="iob_which">Check all the correct answers.</string>
     <string name="iob_deviation">IOB describes the current deviation from expected insulin required based on your profile and settings.</string>
     <string name="iob_hightemp">High temp basal will not be given when your blood sugar is below target.</string>
     <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>
     <string name="iob_posiob">Positive IOB for a substantial period suggests insulin resistance or unannounced meals.</string>
-    <string name="extendedcarbs_label">Question 22: e-carbs</string>
+    <string name="extendedcarbs_label">Question 24: e-carbs</string>
     <string name="extendedcarbs_handling">What could you use e-carbs (extended carbs) for?</string>
     <string name="extendedcarbs_future">To schedule carbs in the future, possibly distributed over an interval (similar to an extended bolus distributing insulin over an interval).</string>
     <string name="extendedcarbs_free">For logging \'free\' exercise carbs you want to hide from AndroidAPS.</string>
     <string name="extendedcarbs_fat">e-carbs (distributed in the future) can assist AndroidAPS in dealing with high fat/protein meals.</string>
     <string name="extendedcarbs_rescue">For logging rescue carbs you use to treat low blood glucose. </string>
     <string name="extendedcarbs_hint1">https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html</string>
-    <string name="nsclient_label">Question 23: Remote Monitoring</string>
+    <string name="nsclient_label">Question 25: Remote Monitoring</string>
     <string name="nsclient_howcanyou">How can you monitor AndroidAPS (for example for your child) remotely?</string>
     <string name="nsclient_nightscout">NS Client app, Nightscout app and Nightscout webpage all allow you to follow AndroidAPS remotely.</string>
     <string name="nsclient_dexcomfollow">Other apps (e.g. Dexcom follow, xDrip running in follow mode) allow you to follow some parameters (e.g. blood glucose/sensor values) remotely, but use different algorithms so may have inaccurate IOB or COB values.</string>
@@ -202,7 +202,7 @@
     <string name="basalhelp_google">Google</string>
     <string name="basalhelp_facebook">Facebook</string>
     <string name="blank"></string>
-    <string name="other_medication_label">Question 24: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
+    <string name="other_medication_label">Question 26: Other Medication. Please read the statement below and then check the box to accept the declaration.</string>
     <string name="other_medication_text">AndroidAPS reduces basal rates or suspends insulin delivery to raise blood sugar. Drugs in the class SGLT2 inhibitors (gliflozins) can prevent increases in blood glucose and therefore can produce a dangerous insulin deficiency leading to DKA.
 \nCommon brand names are: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nI hereby promise that I will not take such drugs when using AndroidAPS or will deactivate the loop before using such drugs.</string>