diff --git a/README.md b/README.md
index 5a0489998..a270ac6b3 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ First of all, follow **step 1** [here](https://www.numworks.com/resources/engine
 git clone --recursive https://github.com/Omega-Numworks/Omega.git
 cd Omega
 make MODEL=n0100 clean
-make MODEL=n0100 USERNAME={Your name, max 15 characters; for spaces, type "\ "} -j4
+make MODEL=n0100 USERNAME="{Your name, max 15 characters}" -j4
 make MODEL=n0100 epsilon_flash
 ```
 
@@ -43,7 +43,7 @@ make MODEL=n0100 epsilon_flash
 git clone --recursive https://github.com/Omega-Numworks/Omega.git
 cd Omega
 make clean
-make USERNAME={Your name, max 15 characters; for spaces, type "\ "} -j4
+make USERNAME="{Your name, max 15 characters}" -j4
 make epsilon_flash
 ```
 
diff --git a/apps/Makefile b/apps/Makefile
index 4bba98235..8696bef5e 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -45,7 +45,7 @@ snapshots_count = $(words $(apps))
 snapshot_includes = $(foreach i,$(app_headers),-include $(i) )
 epsilon_app_names = '$(foreach i,${EPSILON_APPS},"$(i)", )'
 
-$(call object_for,apps/apps_container_storage.cpp apps/apps_container.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) -DUSERNAME=${USERNAME}
+$(call object_for,apps/apps_container_storage.cpp apps/apps_container.cpp apps/main.cpp): CXXFLAGS += $(snapshot_includes) -DAPPS_CONTAINER_APPS_DECLARATION="$(apps_declaration)" -DAPPS_CONTAINER_SNAPSHOT_DECLARATIONS="$(snapshots_declaration)" -DAPPS_CONTAINER_SNAPSHOT_CONSTRUCTORS="$(snapshots_construction)" -DAPPS_CONTAINER_SNAPSHOT_LIST="$(snapshots_list)" -DAPPS_CONTAINER_SNAPSHOT_COUNT=$(snapshots_count) -DEPSILON_APPS_NAMES=$(epsilon_app_names) -DUSERNAME="$(USERNAME)"
 
 # I18n file generation
 
diff --git a/build/config.mak b/build/config.mak
index fa186fab5..d21cdcaab 100644
--- a/build/config.mak
+++ b/build/config.mak
@@ -4,7 +4,7 @@ PLATFORM ?= device
 DEBUG ?= 0
 
 EPSILON_VERSION ?= 12.0.0
-EPSILON_CUSTOM_VERSION ?= 1.13.5-0
+EPSILON_CUSTOM_VERSION ?= 1.13.6-0
 # USERNAME ?= N/A
 # Valid values are "none", "update", "beta"
 EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings
@@ -25,7 +25,7 @@ include build/toolchain.$(TOOLCHAIN).mak
 
 SFLAGS += -DDEBUG=$(DEBUG)
 ifdef USERNAME
-  SFLAGS += -DUSERNAME=$(USERNAME)
+  SFLAGS += -DUSERNAME="$(USERNAME)"
 endif
 SFLAGS += -DEPSILON_GETOPT=$(EPSILON_GETOPT)
 SFLAGS += -DESCHER_LOG_EVENTS_BINARY=$(ESCHER_LOG_EVENTS_BINARY)
diff --git a/ion/src/device/n0110/drivers/led.cpp b/ion/src/device/n0110/drivers/led.cpp
index d29cc8494..f196187af 100644
--- a/ion/src/device/n0110/drivers/led.cpp
+++ b/ion/src/device/n0110/drivers/led.cpp
@@ -2,12 +2,14 @@
 #include <ion/battery.h>
 #include <ion/usb.h>
 
+#include <apps/global_preferences.h>
+
 namespace Ion {
 namespace LED {
 
 KDColor updateColorWithPlugAndCharge() {
   KDColor ledColor = getColor();
-  if (ledColor != KDColorRed) { // If exam mode is on, we do not update the LED with the plugged/charging state
+  if (GlobalPreferences::sharedGlobalPreferences()->examMode() != GlobalPreferences::ExamMode::Activate) { // If exam mode is on, we do not update the LED with the plugged/charging state
     if (USB::isPlugged()) {
       ledColor = Battery::isCharging() ? KDColorOrange : KDColorGreen;
     } else {