1 files changed, 12 insertions, 4 deletions

diff --git a/source/app/AppState.mc b/source/app/AppState.mc
index b900943..fb56689 100644
--- a/source/app/AppState.mc
+++ b/source/app/AppState.mc
@@ -7,6 +7,7 @@
 import Toybox.Application;
 import Toybox.Lang;
 import Toybox.Time;
+import Toybox.WatchUi;
 
 module AppState {
 
@@ -33,8 +34,7 @@ module AppState {
         }
         try {
             var v = new Vault(new Persist.AppStorageBackend(), new TimeSource());
-            v.eraseAfterFailures = options.eraseAfterFailures;
-            v.session.autoLockMs = TestMode.ON ? TestMode.AUTO_LOCK_MS : options.autoLockMs;
+            applyOptions(v);
             vault = v;
             codes = new CodeCache(v);
             processor = new SettingsProcessor();
@@ -88,10 +88,18 @@ module AppState {
         options.load();
         var v = vault;
         if (v != null) {
-            v.eraseAfterFailures = options.eraseAfterFailures;
-            v.session.autoLockMs = TestMode.ON ? TestMode.AUTO_LOCK_MS : options.autoLockMs;
+            applyOptions(v);
             processSettings();
         }
+        // Theme, code size and groups are read at every draw.
+        WatchUi.requestUpdate();
+    }
+
+    // The options the vault itself uses.
+    function applyOptions(v as Vault) as Void {
+        v.eraseAfterFailures = options.eraseAfterFailures;
+        v.encryptNames = options.encryptNames;
+        v.session.autoLockMs = TestMode.ON ? TestMode.AUTO_LOCK_MS : options.autoLockMs;
     }
 
     // Apply any settings form that asks for it (after start-up and on change).