Merge branch 'develop' into cell_caption_option

diff --cc public/trivabble.js
index b191b5033c94735bd71457b5b222163f78b9e5b7,1bfe8d6eca2a2d8e3aca66fe8b1b1b1880608dc8..545e30305350aac037d1f4d09638851c51530f76
--- 1/public/trivabble.js
--- 2/public/trivabble.js
+++ b/public/trivabble.js
@@@ -2278,10 -2268,10 +2281,10 @@@
              setTimerState(document.getElementById("enable-timer").checked);
          };
  
 -        setTimerState(getSetting("TimerEnable", getSetting("ENABLE_TIMER")));
 +        setTimerState(getSetting("ENABLE_TIMER"));
      }
  
-     let timerTimeout = 0
+     let timerTimeout = 0;
  
      function updateTimer() {
          const currentTimer = timerDate();
@@@ -2290,10 -2280,10 +2293,10 @@@
      }
  
      function setTimerState(enabled) {
 -        setSetting("TimerEnable", enabled);
 +        setSetting("ENABLE_TIMER", enabled);
          if (timerTimeout) {
              clearInterval(timerTimeout);
-             timerTimeout = 0
+             timerTimeout = 0;
          }
  
          if (enabled) {