diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index f667b8d..a6e2ffd 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -1,6 +1,9 @@
 name: BTClock CI
 
-on: [push]
+on: 
+  push:
+    tags:
+      - '*'
 
 jobs:
   build:
@@ -24,20 +27,24 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: '3.9'
+      - name: Get current date
+        id: dateAndTime
+        # run: echo "::set-output name=dateAndTime::$(date +'%Y-%m-%d-%H:%M')"
+        run: echo "dateAndTime=$(date +'%Y-%m-%d-%H:%M')" >> $GITHUB_OUTPUT
       - name: Install PlatformIO Core
         run: pip install --upgrade platformio
 
       - name: Build BTClock firmware
-        run: pio run -e esp32wemos-s3-mini_BW 
+        run: pio run -e default 
 
       - name: Build BTClock filesystem
-        run: pio run -e esp32wemos-s3-mini_BW --target buildfs
+        run: pio run -e default --target buildfs
 
       - name: Install esptools.py
         run: pip install --upgrade esptool
 
       - name: Create merged firmware binary
-        run: mkdir -p output && esptool.py --chip esp32s3 merge_bin -o output/full-firmware.bin --flash_mode dio 0x0000 .pio/build/esp32wemos-s3-mini_BW/bootloader.bin 0x8000 .pio/build/esp32wemos-s3-mini_BW/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/esp32wemos-s3-mini_BW/firmware.bin 0x330000 .pio/build/esp32wemos-s3-mini_BW/spiffs.bin
+        run: mkdir -p output && esptool.py --chip esp32s3 merge_bin -o output/full-firmware.bin --flash_mode dio 0x0000 .pio/build/default/bootloader.bin 0x8000 .pio/build/default/partitions.bin 0xe000 ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin 0x10000 .pio/build/default/firmware.bin 0x330000 .pio/build/default/spiffs.bin
 
       - name: Create checksum for merged binary
         run: shasum -a 256 output/full-firmware.bin | awk '{print $1}' > output/full-firmware.sha256
@@ -52,16 +59,14 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           path: |
-            .pio/build/esp32wemos-s3-mini_BW/*.bin
+            .pio/build/default/*.bin
             output/full-firmware.bin
             output/full-firmware.sha256
-
       - name: Create release
         uses: ncipollo/release-action@v1
         with:
-          tag: main
-          commit: main
-          artifacts: "output/full-firmware.bin,output/full-firmware.sha256,.pio/build/esp32wemos-s3-mini_BW/*.bin"
+          name: release-${{ steps.dateAndTime.outputs.dateAndTime }}
+          artifacts: "output/full-firmware.bin,output/full-firmware.sha256,.pio/build/default/*.bin"
           allowUpdates: true
           removeArtifacts: true
       - name: Pushes full-firmware.bin to web flasher
diff --git a/data/src/css/style.scss b/data/src/css/style.scss
index 1de809d..fe56410 100644
--- a/data/src/css/style.scss
+++ b/data/src/css/style.scss
@@ -20,6 +20,7 @@ $form-range-track-bg: #fff;
 @import "../node_modules/bootstrap/scss/navbar";
 @import "../node_modules/bootstrap/scss/nav";
 @import "../node_modules/bootstrap/scss/card";
+@import "../node_modules/bootstrap/scss/progress";
 
 @import "../node_modules/bootstrap/scss/helpers";
 @import "../node_modules/bootstrap/scss/utilities/api";
diff --git a/data/src/index.html b/data/src/index.html
index 2d8f163..0c8b980 100644
--- a/data/src/index.html
+++ b/data/src/index.html
@@ -57,6 +57,20 @@
                 </span>
               </p>
             </div>
+            <hr>
+            <div>
+              <div class="progress" role="progressbar" aria-label="Memory usage" aria-valuenow="{{ memUsage }}" aria-valuemin="0" aria-valuemax="100">
+                <div class="progress-bar progress-bar-striped" style="width: {{ memUsage }}%">{{ memUsage }}%</div>
+              </div>
+              <div class="d-flex justify-content-between">
+                <div>Memory free</div>
+                <div>{{ memFree }} / {{ memTotal }} KiB</div>
+              </div>
+            </div>
+            <hr>
+            <div>
+              <p>Uptime: {{#if uptime.h }}{{ uptime.h }}h {{/if}}{{ uptime.m }}m {{ uptime.s }}s</p>
+            </div>
           </div>
         </div>
       </script>
@@ -177,6 +191,13 @@
                 <input type="text" name="mempoolInstance" id="mempoolInstance" class="form-control">
               </div>
             </div>
+            <div class="row">
+              <label for="hostnamePrefix" class="col-sm-6 col-form-label col-form-label-sm">Hostname prefix</label>
+              <div class="col-sm-6">
+                <input type="text" name="hostnamePrefix" id="hostnamePrefix" class="form-control">
+                <div class="form-text">A restart is required to apply new hostname prefix.</div>
+              </div>
+            </div>
             <div class="row">
               <div class=" col-sm-6">
                 <div class="form-check form-switch">
@@ -213,7 +234,7 @@
             <script id="screens-template" type="text/x-handlebars-template">
               {{#each screens }}
               <div class="row">
-                <div class=" col-sm-6">
+                <div class="col-sm-12">
                 <div class="form-check form-switch">
                   <input class="form-check-input" type="checkbox" id="screen{{id}}" name="screen[{{id}}]" value="1" {{#if enabled}}checked{{/if}}>
                   <label class="form-check-label" for="screen{{id}}">{{name}}</label>
diff --git a/data/src/js/script.ts b/data/src/js/script.ts
index 207b59f..0952e77 100644
--- a/data/src/js/script.ts
+++ b/data/src/js/script.ts
@@ -1,6 +1,23 @@
 import './helpers.js';
 
-var screens = ["Block Height", "Moscow Time", "Ticker", "Time", "Halving countdown"];
+var screens = ["Block Height", "Moscow Time", "Ticker", "Time", "Halving countdown", "Market Cap"];
+
+toTime = (secs) => {
+    var hours = Math.floor(secs / (60 * 60));
+
+    var divisor_for_minutes = secs % (60 * 60);
+    var minutes = Math.floor(divisor_for_minutes / 60);
+
+    var divisor_for_seconds = divisor_for_minutes % 60;
+    var seconds = Math.ceil(divisor_for_seconds);
+
+    var obj = {
+        "h": hours,
+        "m": minutes,
+        "s": seconds
+    };
+    return obj;
+}
 
 getBcStatus = () => {
     fetch('/api/status', {
@@ -11,7 +28,7 @@ getBcStatus = () => {
             var source = document.getElementById("entry-template").innerHTML;
             var template = Handlebars.compile(source);
 
-            var context = { timerRunning: jsonData.timerRunning, currentScreen: jsonData.currentScreen, rendered: jsonData.rendered, data: jsonData.data, screens: screens, ledStatus: jsonData.ledStatus ? jsonData.ledStatus.map((t) => (t).toString(16)) : [] };
+            var context = { timerRunning: jsonData.timerRunning, memUsage: Math.round(jsonData.espFreeHeap / jsonData.espHeapSize * 100), memFree: (jsonData.espFreeHeap / 1024), memTotal: (jsonData.espHeapSize / 1024), uptime: toTime(jsonData.espUptime), currentScreen: jsonData.currentScreen, rendered: jsonData.rendered, data: jsonData.data, screens: screens, ledStatus: jsonData.ledStatus ? jsonData.ledStatus.map((t) => (t).toString(16)) : [] };
 
 
             document.getElementById('output').innerHTML = template(context);
@@ -35,6 +52,7 @@ fetch('/api/settings', {
             document.getElementById('bgColor').querySelector('[value="0xF800"]').remove();
         }
 
+        document.getElementById('customText').setAttribute('maxlength', jsonData.numScreens);
         document.getElementById('output').classList.add("fg-" + jsonData.fgColor.toString(16));
         document.getElementById('output').classList.add("bg-" + jsonData.bgColor.toString(16));
 
@@ -58,6 +76,7 @@ fetch('/api/settings', {
         document.getElementById('fullRefreshMin').value = jsonData.fullRefreshMin;
         document.getElementById('wpTimeout').value = jsonData.wpTimeout;
         document.getElementById('mempoolInstance').value = jsonData.mempoolInstance;
+        document.getElementById('hostnamePrefix').value = jsonData.hostnamePrefix;
 
         if (jsonData.gitRev)
             document.getElementById('gitRev').innerHTML = "Version: " + jsonData.gitRev;
diff --git a/doc/Rev.B/IMG_3310.jpeg b/doc/Rev.B/IMG_3310.jpeg
new file mode 100644
index 0000000..9cd98b4
Binary files /dev/null and b/doc/Rev.B/IMG_3310.jpeg differ
diff --git a/doc/Rev.B/IMG_3313.jpeg b/doc/Rev.B/IMG_3313.jpeg
new file mode 100644
index 0000000..1c20403
Binary files /dev/null and b/doc/Rev.B/IMG_3313.jpeg differ
diff --git a/doc/Rev.B/IMG_3314.jpeg b/doc/Rev.B/IMG_3314.jpeg
new file mode 100644
index 0000000..f26ddf4
Binary files /dev/null and b/doc/Rev.B/IMG_3314.jpeg differ
diff --git a/doc/Rev.B/IMG_3317.jpeg b/doc/Rev.B/IMG_3317.jpeg
new file mode 100644
index 0000000..777777b
Binary files /dev/null and b/doc/Rev.B/IMG_3317.jpeg differ
diff --git a/platformio.ini b/platformio.ini
index 67eb5fa..c2481e2 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,37 +19,19 @@ upload_speed = 921600
 monitor_filters = esp32_exception_decoder, colorize
 extra_scripts = post:scripts/extra_script.py
 build_flags = !python scripts/git_rev.py
-lib_deps = 
-    bblanchon/ArduinoJson@^6.21.2
-    fbiego/ESP32Time@^2.0.1
-    zinggjm/GxEPD2@^1.5.2
-    adafruit/Adafruit MCP23017 Arduino Library@^2.3.0
-    adafruit/Adafruit NeoPixel@^1.11.0
-    https://github.com/me-no-dev/ESPAsyncWebServer.git
-    https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2
 
-[env:esp32doit-devkit-v1]
-board = esp32doit-devkit-v1
-board_build.partitions = partition.csv
-build_flags =
-  -D IS_BW
-  -D NO_MCP
-  -D CONFIG_FREERTOS_USE_TRACE_FACILITY
-  -D ASYNCWEBSERVER_REGEX
-  -D CONFIG_ASYNC_TCP_PRIORITY=500
-
-[env:esp32doit-devkit-v1_3C]
-board = esp32doit-devkit-v1
-board_build.partitions = partition.csv
-build_flags =
-  -D IS_3C
-  -D CONFIG_FREERTOS_USE_TRACE_FACILITY
-
-[env:esp32wemos-s3-mini_BW]
+[esp32wemos-s3-mini_BW_base]
 platform = espressif32
 framework = arduino
 board = lolin_s3_mini
 board_build.partitions = partition.csv
+lib_deps = 
+    bblanchon/ArduinoJson@^6.21.2
+    fbiego/ESP32Time@^2.0.1
+    adafruit/Adafruit MCP23017 Arduino Library@^2.3.0
+    adafruit/Adafruit NeoPixel@^1.11.0
+    https://github.com/me-no-dev/ESPAsyncWebServer.git
+    https://github.com/tzapu/WiFiManager.git#v2.0.16-rc.2
 build_flags =
   !python scripts/git_rev.py
   -DLAST_BUILD_TIME=$UNIX_TIME
@@ -63,44 +45,34 @@ build_flags =
   -D ARDUINO_USB_CDC_ON_BOOT
   -D HOSTNAME="\"btclock3\""
   -mfix-esp32-psram-cache-issue
+  -fexceptions
+  -DPIO_FRAMEWORK_ARDUINO_ENABLE_EXCEPTIONS
+build_unflags = -fno-exceptions
 
-[env:esp32wemos-s3-mini_3C]
-platform = espressif32
-framework = arduino
-board = lolin_s3_mini
-board_build.partitions = partition.csv
+  zinggjm/GxEPD2@^1.5.2
+
+[env:esp32wemos-s3-mini_BW]
+extends = esp32wemos-s3-mini_BW_base
 build_flags =
-  -D NO_DISPLAY
-  -D IS_3C
-  -D IS_S3
-  -D CONFIG_FREERTOS_USE_TRACE_FACILITY
-  -D WITH_RGB_LED
-  -D NEOPIXEL_COUNT=4
-  -D WITH_BUTTONS
-  -DASYNCWEBSERVER_REGEX
-  -D HOSTNAME="\"btclock3c\""
-  -D CONFIG_ASYNC_TCP_PRIORITY=500
+  ${esp32wemos-s3-mini_BW_base.build_flags}
+  https://github.com/dsbaars/GxEPD2#universal_pin
+  https://github.com/dsbaars/universal_pin
+  -DUSE_UNIVERSAL_PIN
+  -D NUM_SCREENS=7
+lib_deps =
+  ${esp32wemos-s3-mini_BW_base.lib_deps}
 
-[env:esp32doit-devkit-v1_nodisp]
-board = esp32doit-devkit-v1
-board_build.partitions = partition.csv
+[env:esp32wemos-s3-mini_BW_9disp]
+extends = esp32wemos-s3-mini_BW_base
 build_flags =
-  -D NO_DISPLAY
-  -D CONFIG_FREERTOS_USE_TRACE_FACILITY
+  ${esp32wemos-s3-mini_BW_base.build_flags}
+  -D NUM_SCREENS=9
 
-[env:esp32_s3_devkit]
-platform = espressif32
-board = esp32-s3-devkitc-1
-board_build.partitions = partition.csv
-;upload_protocol = esp-builtin
+[env:default]
+extends = esp32wemos-s3-mini_BW_base
 build_flags =
-  -D NO_DISPLAY
-  -D NO_MCP
-  -D IS_BW
-  -D WITH_RGB_LED
-  -D NEOPIXEL_COUNT=1
-  -D NEOPIXEL_PIN=38
-  -D CONFIG_ASYNC_TCP_PRIORITY=500
-  -DASYNCWEBSERVER_REGEX
-  -D HOSTNAME="\"btclocks3d\""
-
+  ${esp32wemos-s3-mini_BW_base.build_flags}
+  -D NUM_SCREENS=7
+lib_deps =
+    ${esp32wemos-s3-mini_BW_base.lib_deps}
+    zinggjm/GxEPD2@^1.5.2
\ No newline at end of file
diff --git a/src/config.h b/src/config.h
index 969f86c..e162a17 100644
--- a/src/config.h
+++ b/src/config.h
@@ -24,6 +24,4 @@
 
 #define USER_AGENT "BTClock/1.0"
 
-#define NUM_SCREENS 7
-
 #define I2C_DEV_ADDR 0x55
\ No newline at end of file
diff --git a/src/lib/epd.cpp b/src/lib/epd.cpp
index 3cc5499..b936e00 100644
--- a/src/lib/epd.cpp
+++ b/src/lib/epd.cpp
@@ -26,7 +26,7 @@ void setFgColor(int color)
 
 void showSetupQr(const String &ssid, const String &password)
 {
-    char displayIndex = 6;
+    uint displayIndex = 6;
 
     const String text = "WIFI:S:" + ssid + ";T:WPA;P:" + password + ";;";
 
diff --git a/src/lib/functions.cpp b/src/lib/functions.cpp
index d5e6a43..78d2d33 100644
--- a/src/lib/functions.cpp
+++ b/src/lib/functions.cpp
@@ -36,8 +36,8 @@ void setupSoftAP()
 {
     byte mac[6];
     WiFi.macAddress(mac);
-    softAP_SSID = String("BTClock" + String(mac[5], 16) + String(mac[1], 16));
-    WiFi.setHostname(softAP_SSID.c_str());
+    softAP_SSID = getMyHostname().c_str();
+    WiFi.setHostname(getMyHostname().c_str());
     softAP_password = base64::encode(String(mac[2], 16) + String(mac[4], 16) + String(mac[5], 16) + String(mac[1], 16)).substring(2, 10);
 }
 
@@ -64,7 +64,7 @@ void setupComponents()
     // Serial.println(F("Leds should be on"));
 
 #ifndef NO_MCP
-    if (!mcp.begin_I2C())
+    if (!mcp.begin_I2C(0x20))
     {
         Serial.println(F("Error MCP23017"));
         pixels.setPixelColor(0, pixels.Color(255, 0, 0));
@@ -85,7 +85,7 @@ void setupComponents()
         pixels.show();
         //  delay(200);
         pinMode(MCP_INT_PIN, INPUT);
-        mcp.setupInterrupts(true, false, LOW);
+        mcp.setupInterrupts(false, false, LOW);
     }
 #endif
 
@@ -143,6 +143,8 @@ void setupWifi()
     }
 #endif
 
+    //WiFi.persistent(true);
+    WiFi.enableLongRange(false);
     setupSoftAP();
 
     wm.setConfigPortalTimeout(preferences.getUInt("wpTimeout", 600));
@@ -156,6 +158,12 @@ void setupWifi()
       softAP_password.c_str()); });
 
     bool ac = wm.autoConnect(softAP_SSID.c_str(), softAP_password.c_str());
+    WiFi.onEvent(onWifiLostIp, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_LOST_IP);
+
+}
+
+void onWifiLostIp(WiFiEvent_t event, WiFiEventInfo_t info) {
+    ESP.restart();
 }
 
 void setupPreferences()
@@ -172,7 +180,9 @@ void setupPreferences()
                      {SCREEN_MSCW_TIME, "Sats per dollar"},
                      {SCREEN_BTC_TICKER, "Ticker"},
                      {SCREEN_TIME, "Time"},
-                     {SCREEN_HALVING_COUNTDOWN, "Halving countdown"}};
+                     {SCREEN_HALVING_COUNTDOWN, "Halving countdown"},
+                     {SCREEN_MARKET_CAP, "Market Cap"}
+                     };
 
 #ifdef WITH_RGB_LED
     pixels.setBrightness(preferences.getUInt("ledBrightness", 128));
@@ -214,28 +224,24 @@ void handleScreenTasks(uint screen)
         vTaskSuspend(blockNotifyTaskHandle);
     if (getPriceTaskHandle)
         vTaskSuspend(getPriceTaskHandle);
-    if (minuteTaskHandle)
-        vTaskSuspend(minuteTaskHandle);
     switch (currentScreen)
     {
     case SCREEN_BLOCK_HEIGHT:
-        if (blockNotifyTaskHandle)
-        {
-            vTaskResume(blockNotifyTaskHandle);
-        }
-        break;
     case SCREEN_HALVING_COUNTDOWN:
         if (blockNotifyTaskHandle)
             vTaskResume(blockNotifyTaskHandle);
         break;
     case SCREEN_BTC_TICKER:
-        if (getPriceTaskHandle)
-            vTaskResume(getPriceTaskHandle);
-        break;
     case SCREEN_MSCW_TIME:
         if (getPriceTaskHandle)
             vTaskResume(getPriceTaskHandle);
         break;
+    case SCREEN_MARKET_CAP:
+        if (getPriceTaskHandle)
+            vTaskResume(getPriceTaskHandle);
+        if (blockNotifyTaskHandle)
+            vTaskResume(blockNotifyTaskHandle);
+        break;
     case SCREEN_TIME:
         if (minuteTaskHandle)
         {
@@ -363,23 +369,26 @@ void previousScreen()
 
 void showNetworkSettings()
 {
-    std::array<String, 7> epdContent = {"", "", "", "", "", "", ""};
+    std::array<String, NUM_SCREENS> epdContent = {"", "", "", "", "", "", ""};
 
     String ipAddr = WiFi.localIP().toString();
     String subNet = WiFi.subnetMask().toString();
 
-    epdContent[1] = "IP/Subnet";
+    epdContent[0] = "IP/Subnet";
 
     int ipAddrPos = 0;
     int subnetPos = 0;
     for (int i = 0; i < 4; i++)
     {
-        epdContent[2 + i] = ipAddr.substring(0, ipAddr.indexOf('.')) + "/" + subNet.substring(0, subNet.indexOf('.'));
+        epdContent[1 + i] = ipAddr.substring(0, ipAddr.indexOf('.')) + "/" + subNet.substring(0, subNet.indexOf('.'));
         ipAddrPos = ipAddr.indexOf('.') + 1;
         subnetPos = subNet.indexOf('.') + 1;
         ipAddr = ipAddr.substring(ipAddrPos);
         subNet = subNet.substring(subnetPos);
     }
+    epdContent[NUM_SCREENS-2] = "RAM/Status";
+
+    epdContent[NUM_SCREENS-1] = String((int)round(ESP.getFreeHeap()/1024)) + "/" + (int)round(ESP.getHeapSize()/1024);
 
     CustomTextScreen::setText(epdContent);
 
diff --git a/src/lib/functions.hpp b/src/lib/functions.hpp
index 49fcb66..d4d939d 100644
--- a/src/lib/functions.hpp
+++ b/src/lib/functions.hpp
@@ -5,6 +5,7 @@
 //#include <WiFiMulti.h>
 
 #include "config.h"
+#include "utils.hpp"
 #include "shared.hpp"
 #include "Adafruit_GFX.h"
 #include "lib/epd.hpp"
@@ -28,6 +29,7 @@ void setCurrentScreen(uint screen);
 void handleScreenTasks(uint screen);
 void showNetworkSettings();
 void toggleScreenTimer();
+void onWifiLostIp(WiFiEvent_t event, WiFiEventInfo_t info);
 
 void timebasedChangeTask(void *parameter);
 
diff --git a/src/lib/pin/mcp23017_pin.cpp b/src/lib/pin/mcp23017_pin.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/lib/pin/mcp23017_pin.hpp b/src/lib/pin/mcp23017_pin.hpp
deleted file mode 100644
index a9e5c0e..0000000
--- a/src/lib/pin/mcp23017_pin.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "universal_pin.hpp"
-
-class MCP23017_Pin : public UniversalPin 
-{
-
-};
\ No newline at end of file
diff --git a/src/lib/pin/native_pin.cpp b/src/lib/pin/native_pin.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/lib/pin/native_pin.hpp b/src/lib/pin/native_pin.hpp
deleted file mode 100644
index 3b2c5f3..0000000
--- a/src/lib/pin/native_pin.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "universal_pin.hpp"
-
-class Native_Pin : public UniversalPin 
-{
-
-};
\ No newline at end of file
diff --git a/src/lib/pin/pcf8575_pin.cpp b/src/lib/pin/pcf8575_pin.cpp
deleted file mode 100644
index e69de29..0000000
diff --git a/src/lib/pin/pcf8575_pin.hpp b/src/lib/pin/pcf8575_pin.hpp
deleted file mode 100644
index 9795fae..0000000
--- a/src/lib/pin/pcf8575_pin.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "universal_pin.hpp"
-
-class PCF8575_Pin : public UniversalPin 
-{
-
-};
\ No newline at end of file
diff --git a/src/lib/pin/universal_pin.cpp b/src/lib/pin/universal_pin.cpp
deleted file mode 100644
index b64aa72..0000000
--- a/src/lib/pin/universal_pin.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "universal_pin.hpp"
-
-UniversalPin::UniversalPin(uint pinNumber) {
-    this->pinNumber = pinNumber;
-}
\ No newline at end of file
diff --git a/src/lib/pin/universal_pin.hpp b/src/lib/pin/universal_pin.hpp
deleted file mode 100644
index e673632..0000000
--- a/src/lib/pin/universal_pin.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <Arduino.h>
-
-class UniversalPin
-{
-    public:
-        UniversalPin(uint pinNumber);
-        virtual void pinMode(uint8_t mode);
-        virtual uint8_t digitalRead();
-        virtual void digitalWrite(uint8_t value);
-    protected:
-        uint pinNumber;
-};
\ No newline at end of file
diff --git a/src/lib/utils.cpp b/src/lib/utils.cpp
new file mode 100644
index 0000000..480ca6a
--- /dev/null
+++ b/src/lib/utils.cpp
@@ -0,0 +1,54 @@
+#include "utils.hpp";
+
+double getSupplyAtBlock(uint blockNr) {
+    if (blockNr >= 33 * 210000) {
+        return 20999999.9769;
+    } 
+
+    const int initialBlockReward = 50;  // Initial block reward
+    const int halvingInterval = 210000;  // Number of blocks before halving
+
+    int halvingCount = blockNr / halvingInterval;
+    double totalBitcoinInCirculation = 0;
+
+    for (int i = 0; i < halvingCount; ++i) {
+        totalBitcoinInCirculation += halvingInterval * initialBlockReward * std::pow(0.5, i);
+    }
+
+    totalBitcoinInCirculation += (blockNr % halvingInterval) * initialBlockReward * std::pow(0.5, halvingCount);
+
+    return totalBitcoinInCirculation;
+}
+
+std::string formatNumberWithSuffix(int64_t num) {
+    const long long quadrillion = 1000000000000000LL;
+    const long long trillion = 1000000000000LL;
+    const long long billion = 1000000000;
+    const long long million = 1000000;
+    const long long thousand = 1000;
+
+    if (num >= quadrillion) {
+        return std::to_string(num / quadrillion) + "Q";
+    } else if (num >= trillion) {
+        return std::to_string(num / trillion) + "T";
+    } else if (num >= billion) {
+        return std::to_string(num / billion) + "B";
+    } else if (num >= million) {
+        return std::to_string(num / million) + "M";
+    } else if (num >= thousand) {
+        return std::to_string(num / thousand) + "K";
+    } else {
+        return std::to_string(num);
+    }
+}
+
+String getMyHostname() {
+    uint8_t mac[6];
+    //WiFi.macAddress(mac);
+    esp_efuse_mac_get_default(mac);
+    char hostname[15]; 
+    String hostnamePrefix = preferences.getString("hostnamePrefix", "btclock");
+    snprintf(hostname, sizeof(hostname), "%s-%02x%02x%02x",
+             hostnamePrefix, mac[3], mac[4], mac[5]);
+    return hostname;
+}
\ No newline at end of file
diff --git a/src/lib/utils.hpp b/src/lib/utils.hpp
new file mode 100644
index 0000000..32f2a6d
--- /dev/null
+++ b/src/lib/utils.hpp
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "shared.hpp"
+
+double getSupplyAtBlock(uint blockNr);
+std::string formatNumberWithSuffix(int64_t num);
+String getMyHostname();
diff --git a/src/lib/webserver.cpp b/src/lib/webserver.cpp
index 1a4782d..0f96454 100644
--- a/src/lib/webserver.cpp
+++ b/src/lib/webserver.cpp
@@ -52,7 +52,7 @@ void setupWebserver()
 
     // Start server
     server.begin();
-    if (!MDNS.begin(HOSTNAME))
+    if (!MDNS.begin(getMyHostname()))
     {
         Serial.println(F("Error setting up MDNS responder!"));
         while (1)
@@ -61,13 +61,16 @@ void setupWebserver()
         }
     }
     MDNS.addService("http", "tcp", 80);
+    MDNS.addServiceTxt("http", "tcp", "model", "BTClock");
+    MDNS.addServiceTxt("http", "tcp", "version", "2.0");
+    MDNS.addServiceTxt("http", "tcp", "rev", GIT_REV);
     Serial.println(F("Webserver should be running"));
 }
 
 /**
  * @Api
  * @Path("/api/status")
-*/
+ */
 void onApiStatus(AsyncWebServerRequest *request)
 {
     AsyncResponseStream *response = request->beginResponseStream("application/json");
@@ -75,10 +78,15 @@ void onApiStatus(AsyncWebServerRequest *request)
     StaticJsonDocument<512> root;
     root["currentScreen"] = String(getCurrentScreen());
     root["timerRunning"] = timerRunning;
-
+    root["numScreens"] = NUM_SCREENS;
+    root["espUptime"] = esp_timer_get_time() / 1000000;
+    root["espFreeHeap"] = ESP.getFreeHeap();
+    root["espHeapSize"] = ESP.getHeapSize();
+    root["espFreePsram"] = ESP.getFreePsram();
+    root["espPsramSize"] = ESP.getPsramSize();
     JsonArray data = root.createNestedArray("data");
     JsonArray rendered = root.createNestedArray("rendered");
-    String epdContent[7];
+    String epdContent[NUM_SCREENS];
 
 #ifdef WITH_RGB_LED
 
@@ -105,7 +113,7 @@ void onApiStatus(AsyncWebServerRequest *request)
 /**
  * @Api
  * @Path("/api/action/pause")
-*/
+ */
 void onApiActionPause(AsyncWebServerRequest *request)
 {
     timerRunning = false;
@@ -117,7 +125,7 @@ void onApiActionPause(AsyncWebServerRequest *request)
 /**
  * @Api
  * @Path("/api/action/full_refresh")
-*/
+ */
 void onApiFullRefresh(AsyncWebServerRequest *request)
 {
 
@@ -129,7 +137,7 @@ void onApiFullRefresh(AsyncWebServerRequest *request)
 /**
  * @Api
  * @Path("/api/action/timer_restart")
-*/
+ */
 void onApiActionTimerRestart(AsyncWebServerRequest *request)
 {
     // moment = millis();
@@ -143,7 +151,7 @@ void onApiActionTimerRestart(AsyncWebServerRequest *request)
  * @Api
  * @Path("/api/action/update")
  * @Parameter int rate Time in minutes
-*/
+ */
 void onApiActionUpdate(AsyncWebServerRequest *request)
 {
     if (request->hasParam("rate"))
@@ -162,10 +170,11 @@ void onApiActionUpdate(AsyncWebServerRequest *request)
  * @Api
  * @Method GET
  * @Path("/api/settings")
-*/
+ */
 void onApiSettingsGet(AsyncWebServerRequest *request)
 {
-    StaticJsonDocument<768> root;
+    StaticJsonDocument<1536> root;
+    root["numScreens"] = NUM_SCREENS;
     root["fgColor"] = getFgColor();
     root["bgColor"] = getBgColor();
     root["timerSeconds"] = timerSeconds;
@@ -178,7 +187,9 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
     root["rpcUser"] = preferences.getString("rpcUser", BITCOIND_RPC_USER);
     root["rpcHost"] = preferences.getString("rpcHost", BITCOIND_HOST);
     root["mempoolInstance"] = preferences.getString("mempoolInstance", DEFAULT_MEMPOOL_INSTANCE);
-
+    root["hostnamePrefix"] = preferences.getString("hostnamePrefix", "btclock");
+    root["hostname"] = getMyHostname();
+    
 #ifdef IS_BW
     root["epdColors"] = 2;
 #else
@@ -206,7 +217,7 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
 
     AsyncResponseStream *response = request->beginResponseStream("application/json");
     serializeJson(root, *response);
-    
+
     request->send(response);
 }
 
@@ -284,6 +295,14 @@ void onApiSettingsPost(AsyncWebServerRequest *request)
         settingsChanged = true;
     }
 
+    if (request->hasParam("hostnamePrefix", true))
+    {
+        AsyncWebParameter *hostnamePrefix = request->getParam("hostnamePrefix", true);
+
+        preferences.putString("hostnamePrefix", hostnamePrefix->value().c_str());
+        settingsChanged = true;
+    }
+
     if (request->hasParam("ledBrightness", true))
     {
         AsyncWebParameter *ledBrightness = request->getParam("ledBrightness", true);
@@ -403,7 +422,7 @@ void onApiShowTextAdvanced(AsyncWebServerRequest *request, JsonVariant &json)
 
     JsonArray screens = json.as<JsonArray>();
 
-    std::array<String, 7> epdContent;
+    std::array<String, NUM_SCREENS> epdContent;
     int i = 0;
     for (JsonVariant s : screens)
     {
diff --git a/src/main.cpp b/src/main.cpp
index b5208a1..5d30115 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,6 @@
 #include <shared.hpp>
 #include <WiFi.h>
 #include <WiFiClientSecure.h>
-// #include <ESP32Time.h>
 #include <WiFiManager.h>
 
 #ifdef CONFIG_BT_ENABLED
@@ -18,15 +17,15 @@
 #include "screens/blockheight.hpp"
 #include "screens/ticker.hpp"
 #include "screens/time.hpp"
-//#include "screens/sats_per_dollar.hpp"
 #include "screens/halvingcountdown.hpp"
+#include "screens/market_cap.hpp"
 
 #include "tasks/ha.hpp"
 #include "tasks/epd.hpp"
 #include "tasks/button.hpp"
 #include "tasks/led_handler.hpp"
 
-//WiFiClient wifiClientInsecure;
+WiFiClient wifiClientInsecure;
 WiFiClientSecure wifiClient;
 ESP32Time rtc(3600);
 
@@ -49,7 +48,6 @@ void setup()
   setupComponents();
   setupPreferences();
 #ifndef NO_DISPLAY
-  resetAllDisplays();
   initDisplays();
 #endif
   setupWifi();
@@ -65,7 +63,7 @@ void setup()
     BlockHeightScreen::init();
     HalvingCountdownScreen::init();
     TickerScreen::init();
- //   SatsPerDollarScreen::init();
+    MarketCapScreen::init();
 
 #ifdef WITH_BUTTONS
     setupButtonTask();
@@ -80,15 +78,15 @@ void setup()
     registerNewBlockCallback(BlockHeightScreen::onNewBlock);
     registerNewBlockCallback(HalvingCountdownScreen::onNewBlock);
     registerNewPriceCallback(TickerScreen::onPriceUpdate);
-//    registerNewPriceCallback(SatsPerDollarScreen::onPriceUpdate);
 
     setupDisplays();
-  } else {
+  }
+  else
+  {
     setupI2C();
   }
 }
 
 void loop()
 {
-  // put your main code here, to run repeatedly:
 }
diff --git a/src/screens/blockheight.cpp b/src/screens/blockheight.cpp
index 62d8615..44bfec4 100644
--- a/src/screens/blockheight.cpp
+++ b/src/screens/blockheight.cpp
@@ -57,4 +57,8 @@ std::array<String, NUM_SCREENS> BlockHeightScreen::getEpdContent()
     //    std::copy(std::begin(BlockHeightScreen::epdContent), std::end(BlockHeightScreen::epdContent), std::begin(ret));
 
     return ret;
+}
+
+uint BlockHeightScreen::getBlockNr() {
+    return blockNr;
 }
\ No newline at end of file
diff --git a/src/screens/blockheight.hpp b/src/screens/blockheight.hpp
index e44443b..c0a4440 100644
--- a/src/screens/blockheight.hpp
+++ b/src/screens/blockheight.hpp
@@ -17,4 +17,5 @@ public:
     static void showScreen();
     static void onNewBlock(uint blockNr);
     static std::array<String, NUM_SCREENS> getEpdContent();
+    static uint getBlockNr();
 };
\ No newline at end of file
diff --git a/src/screens/custom_text.cpp b/src/screens/custom_text.cpp
index 1a293c3..aa6b992 100644
--- a/src/screens/custom_text.cpp
+++ b/src/screens/custom_text.cpp
@@ -18,7 +18,7 @@ void CustomTextScreen::setSimpleText(const String& text)
 
     customText.insert(customText.begin(), NUM_SCREENS - customText.length(), ' ');
 
-    for (uint i = 0; i < 7; i++)
+    for (uint i = 0; i < NUM_SCREENS; i++)
     {
         CustomTextScreen::epdContent[i] = customText[i];
     }
@@ -30,7 +30,7 @@ void CustomTextScreen::setText(std::array<String, NUM_SCREENS> customContent)
 }
 
 
-std::array<String, 7> CustomTextScreen::getEpdContent()
+std::array<String, NUM_SCREENS> CustomTextScreen::getEpdContent()
 {
     return CustomTextScreen::epdContent;
 }
\ No newline at end of file
diff --git a/src/screens/custom_text.hpp b/src/screens/custom_text.hpp
index 43191e3..1c1a7db 100644
--- a/src/screens/custom_text.hpp
+++ b/src/screens/custom_text.hpp
@@ -16,5 +16,5 @@ class CustomTextScreen {
         static void showScreen();
         static std::array<String, NUM_SCREENS> getEpdContent();
         static void setSimpleText(const String& text);
-        static void setText(std::array<String, 7> customContent);
+        static void setText(std::array<String, NUM_SCREENS> customContent);
 };
\ No newline at end of file
diff --git a/src/screens/halvingcountdown.cpp b/src/screens/halvingcountdown.cpp
index 5d8cf4d..9cb02b1 100644
--- a/src/screens/halvingcountdown.cpp
+++ b/src/screens/halvingcountdown.cpp
@@ -25,8 +25,7 @@ void HalvingCountdownScreen::init()
     for (int i = 0; i < NUM_SCREENS; i++)
     {
         epdContentP[i] = HalvingCountdownScreen::psramBuffer + i * maxStringLength;
-      //  strcpy(epdContent[i], "x");
-        strcpy(epdContentP[i], "x");
+        strcpy(epdContentP[i], "");
     }
     initialized = true;
     setupBlockNotify();
@@ -48,18 +47,12 @@ void HalvingCountdownScreen::showScreen()
 
     snprintf(HalvingCountdownScreen::epdContentP[0], maxStringLength, "BIT/COIN");
     snprintf(HalvingCountdownScreen::epdContentP[1], maxStringLength, "HALV/ING");
-    snprintf(HalvingCountdownScreen::epdContentP[2], maxStringLength, "%d/YRS", years);
+    snprintf(HalvingCountdownScreen::epdContentP[(NUM_SCREENS-5)], maxStringLength, "%d/YRS", years);
 
-    snprintf(HalvingCountdownScreen::epdContentP[3], maxStringLength, "%d/DAYS", days);
-    snprintf(HalvingCountdownScreen::epdContentP[4], maxStringLength, "%d/HRS", hours);
-    snprintf(HalvingCountdownScreen::epdContentP[5], maxStringLength, "%d/MINS", mins);
-    snprintf(HalvingCountdownScreen::epdContentP[6], maxStringLength, "TO/GO");
-
-    //     // strcpy(epdContent[2], sprintf(String(years) + "/YRS").c_str());
-    //    // snprintf(epdContent[2], sizeof(epdContent[2]), "%d/YRS", years);
-    //     //  strcpy(epdContent[3], String(days) + "/DAYS");
-    //     //    strcpy(epdContent[4], String(hours) + "/HRS");
-    //     //  strcpy(epdContent[5], String(mins) + "/MINS");
+    snprintf(HalvingCountdownScreen::epdContentP[(NUM_SCREENS-4)], maxStringLength, "%d/DAYS", days);
+    snprintf(HalvingCountdownScreen::epdContentP[(NUM_SCREENS-3)], maxStringLength, "%d/HRS", hours);
+    snprintf(HalvingCountdownScreen::epdContentP[(NUM_SCREENS-2)], maxStringLength, "%d/MINS", mins);
+    snprintf(HalvingCountdownScreen::epdContentP[(NUM_SCREENS-1)], maxStringLength, "TO/GO");
 }
 
 uint HalvingCountdownScreen::getNextHalvingBlockNr()
diff --git a/src/screens/market_cap.cpp b/src/screens/market_cap.cpp
new file mode 100644
index 0000000..46db538
--- /dev/null
+++ b/src/screens/market_cap.cpp
@@ -0,0 +1,30 @@
+#include "market_cap.hpp"
+
+uint MarketCapScreen::satsPerDollar = 0;
+std::array<String, NUM_SCREENS> MarketCapScreen::epdContent = {"", "", "", "", "", "", ""};
+
+void MarketCapScreen::init()
+{
+    // Dependent on price and blocks
+    MarketCapScreen::showScreen();
+}
+
+void MarketCapScreen::showScreen()
+{
+    double supply = getSupplyAtBlock(BlockHeightScreen::getBlockNr());
+    int64_t marketCap = static_cast<std::int64_t>(supply * double(TickerScreen::getPrice()));
+
+    std::string priceString = "$" + formatNumberWithSuffix(marketCap);
+    priceString.insert(priceString.begin(), NUM_SCREENS - priceString.length(), ' ');
+
+    epdContent[0] = "USD/MCAP";
+    for (uint i = 1; i < NUM_SCREENS; i++)
+    {
+        MarketCapScreen::epdContent[i] = priceString[i];
+    }
+}
+
+std::array<String, NUM_SCREENS> MarketCapScreen::getEpdContent()
+{
+    return MarketCapScreen::epdContent;
+}
\ No newline at end of file
diff --git a/src/screens/market_cap.hpp b/src/screens/market_cap.hpp
new file mode 100644
index 0000000..e7e0e79
--- /dev/null
+++ b/src/screens/market_cap.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "base.hpp"
+#include "config.h"
+#include "shared.hpp"
+#include "lib/utils.hpp"
+#include "blockheight.hpp";
+#include "ticker.hpp";
+#include "tasks/epd.hpp"
+
+class MarketCapScreen {
+    protected:
+        static uint satsPerDollar;
+        static std::array<String, NUM_SCREENS> epdContent;
+    public:
+        static void init();
+        static void showScreen();
+        static void onPriceUpdate(uint price);
+        static std::array<String, NUM_SCREENS> getEpdContent();
+};
\ No newline at end of file
diff --git a/src/screens/sats_per_dollar.cpp b/src/screens/sats_per_dollar.cpp
deleted file mode 100644
index b292b94..0000000
--- a/src/screens/sats_per_dollar.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// #include "sats_per_dollar.hpp"
-
-// uint SatsPerDollarScreen::satsPerDollar = 0;
-// std::array<String, NUM_SCREENS> SatsPerDollarScreen::epdContent = { "", "", "", "", "", "", "" };
-
-// void SatsPerDollarScreen::init() {
-//     SatsPerDollarScreen::satsPerDollar = int(round(1 / preferences.getFloat("btcPrice", 12345) * 10e7));
-//     setupGetPriceTask();
-//     SatsPerDollarScreen::showScreen();
-// }
-
-// void SatsPerDollarScreen::showScreen() {
-//     std::string satsPerDollarString = String(SatsPerDollarScreen::satsPerDollar).c_str();
-//     satsPerDollarString.insert(satsPerDollarString.begin(), 7 - satsPerDollarString.length(), ' ');
-//     epdContent[0] = "MSCW/TIME";
-//     for (uint i = 1; i < NUM_SCREENS; i++)
-//     {
-//         SatsPerDollarScreen::epdContent[i] = satsPerDollarString[i];
-//     }
-// }
-
-// void SatsPerDollarScreen::onPriceUpdate(uint price) {
-//     SatsPerDollarScreen::satsPerDollar = int(round(1 / float(price) * 10e7));
-
-//     SatsPerDollarScreen::showScreen();
-// }
-
-// std::array<String, NUM_SCREENS> SatsPerDollarScreen::getEpdContent() {
-//     return SatsPerDollarScreen::epdContent;
-// }
\ No newline at end of file
diff --git a/src/screens/sats_per_dollar.hpp b/src/screens/sats_per_dollar.hpp
deleted file mode 100644
index 428b49c..0000000
--- a/src/screens/sats_per_dollar.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// #pragma once
-
-// #include "base.hpp"
-// #include "config.h"
-// #include "shared.hpp"
-// #include "tasks/epd.hpp"
-
-// class SatsPerDollarScreen {
-//     protected:
-//         static uint satsPerDollar;
-//         static std::array<String, NUM_SCREENS> epdContent;
-//     public:
-//         static void init();
-//         static void showScreen();
-//         static void onPriceUpdate(uint price);
-//         static std::array<String, NUM_SCREENS> getEpdContent();
-// };
\ No newline at end of file
diff --git a/src/screens/ticker.cpp b/src/screens/ticker.cpp
index da2f7f0..b902477 100644
--- a/src/screens/ticker.cpp
+++ b/src/screens/ticker.cpp
@@ -48,4 +48,8 @@ std::array<String, NUM_SCREENS> TickerScreen::getEpdContentSats() {
 
 
     return epdContentSats;
+}
+
+uint TickerScreen::getPrice() {
+    return price;
 }
\ No newline at end of file
diff --git a/src/screens/ticker.hpp b/src/screens/ticker.hpp
index 420e6ed..df9adf8 100644
--- a/src/screens/ticker.hpp
+++ b/src/screens/ticker.hpp
@@ -18,4 +18,5 @@ public:
     static void onPriceUpdate(uint price);
     static std::array<String, NUM_SCREENS> getEpdContent();
     static std::array<String, NUM_SCREENS> getEpdContentSats();
+    static uint getPrice();
 };
\ No newline at end of file
diff --git a/src/screens/time.cpp b/src/screens/time.cpp
index 9968a06..2d8717c 100644
--- a/src/screens/time.cpp
+++ b/src/screens/time.cpp
@@ -8,12 +8,13 @@ void TimeScreen::init() {
 }
 
 void TimeScreen::showScreen() {
-   // String(String(rtc.getDay()) + "/" + String(rtc.getMonth() + 1)).toCharArray(TimeScreen::dateString, 5);
-  //  rtc.getTime("%H:%M").toCharArray(TimeScreen::timeString, 5);
-
     std::string timeString = rtc.getTime("%H:%M").c_str();
     timeString.insert(timeString.begin(), NUM_SCREENS - timeString.length(), ' ');
-    TimeScreen::epdContent[0] = String(rtc.getDay()) + "/" + String(rtc.getMonth() + 1);
+    char dateTmp[6];
+    snprintf(dateTmp, 6, "%d/%d", rtc.getDay(), (rtc.getMonth() + 1));
+
+    TimeScreen::epdContent[0] = dateTmp;
+
     for (uint i = 1; i < NUM_SCREENS; i++)
     {
         TimeScreen::epdContent[i] = timeString[i];
diff --git a/src/screens/time.hpp b/src/screens/time.hpp
index 6061383..0e47c71 100644
--- a/src/screens/time.hpp
+++ b/src/screens/time.hpp
@@ -7,13 +7,13 @@
 
 class TimeScreen {
     protected:
-        static std::array<String, 7> epdContent;
+        static std::array<String, NUM_SCREENS> epdContent;
         static TimeScreen* instance_;
     public:
         static void init();
         static void showScreen();
         static void onNewMinute();
         static void onActivate();
-        static std::array<String, 7> getEpdContent();
+        static std::array<String, NUM_SCREENS> getEpdContent();
         static TimeScreen* getInstance();
 };
\ No newline at end of file
diff --git a/src/shared.hpp b/src/shared.hpp
index 9fe97ff..42d038f 100644
--- a/src/shared.hpp
+++ b/src/shared.hpp
@@ -26,7 +26,7 @@
 typedef std::function<void()> EventCallback;
 typedef std::function<void(uint number)> EventCallbackWithNumber;
 
-//extern WiFiClient wifiClientInsecure;
+extern WiFiClient wifiClientInsecure;
 extern WiFiClientSecure wifiClient;
 
 extern ESP32Time rtc;
@@ -55,9 +55,11 @@ const PROGMEM int SCREEN_MSCW_TIME = 1;
 const PROGMEM int SCREEN_BTC_TICKER = 2;
 const PROGMEM int SCREEN_TIME = 3;
 const PROGMEM int SCREEN_HALVING_COUNTDOWN = 4;
+const PROGMEM int SCREEN_MARKET_CAP = 5;
+
 const PROGMEM int SCREEN_COUNTDOWN = 98;
 const PROGMEM int SCREEN_CUSTOM = 99;
-const PROGMEM int screens[5] = { SCREEN_BLOCK_HEIGHT, SCREEN_MSCW_TIME, SCREEN_BTC_TICKER, SCREEN_TIME, SCREEN_HALVING_COUNTDOWN };
+const PROGMEM int screens[6] = { SCREEN_BLOCK_HEIGHT, SCREEN_MSCW_TIME, SCREEN_BTC_TICKER, SCREEN_TIME, SCREEN_HALVING_COUNTDOWN, SCREEN_MARKET_CAP };
 
 const uint screenCount = sizeof(screens) / sizeof(int);
 
diff --git a/src/tasks/blocknotify.cpp b/src/tasks/blocknotify.cpp
index b09e603..dd5c042 100644
--- a/src/tasks/blocknotify.cpp
+++ b/src/tasks/blocknotify.cpp
@@ -18,20 +18,23 @@ bool useBitcoind = true;
 void checkBitcoinBlock(void *pvParameters)
 {
     uint blockHeight = preferences.getUInt("blockHeight", currentBlockHeight);
- 
-  
-    useBitcoind = preferences.getBool("useNode", false) && wifiClient.connect(preferences.getString("rpcHost", BITCOIND_HOST).c_str(), preferences.getUInt("rpcPort", BITCOIND_PORT));
+
+    useBitcoind = preferences.getBool("useNode", false) && wifiClientInsecure.connect(preferences.getString("rpcHost", BITCOIND_HOST).c_str(), preferences.getUInt("rpcPort", BITCOIND_PORT));
     if (useBitcoind)
         Serial.println(F("bitcoind node is reachable, using this for blocks."));
     else
         Serial.println(F("bitcoind node is not reachable, using mempool API instead."));
 
-    IPAddress result;
+    if (!useBitcoind)
+    {
+        IPAddress result;
 
-    int err = WiFi.hostByName(preferences.getString("mempoolInstance", DEFAULT_MEMPOOL_INSTANCE).c_str(), result) ;
+        int err = WiFi.hostByName(preferences.getString("mempoolInstance", DEFAULT_MEMPOOL_INSTANCE).c_str(), result);
 
-    if (err != 1) {
-        flashTemporaryLights(255, 0, 0);
+        if (err != 1)
+        {
+            flashTemporaryLights(255, 0, 0);
+        }
     }
 
     for (;;)
@@ -79,7 +82,9 @@ void checkBitcoinBlock(void *pvParameters)
                 Serial.print(F("Error in HTTP request to mempool API: "));
                 Serial.print(httpCode);
                 Serial.println(http->errorToString(httpCode));
-
+                  if (httpCode == -1) {
+                    WiFi.reconnect();
+                  }
             }
 
             http->end();
@@ -93,7 +98,7 @@ void checkBitcoinBlock(void *pvParameters)
             currentBlockHeight = blockHeight;
             preferences.putUInt("blockHeight", currentBlockHeight);
         }
-        delete http; 
+        delete http;
         vTaskDelay(pdMS_TO_TICKS(BLOCKNOTIFY_WAIT_TIME)); // wait 1 minute before checking again
     }
 }
diff --git a/src/tasks/button.cpp b/src/tasks/button.cpp
index ac78a2d..3769bdc 100644
--- a/src/tasks/button.cpp
+++ b/src/tasks/button.cpp
@@ -3,71 +3,70 @@
  * Button 2: Next Screen
  * Button 3: Previous Screen
  * Button 4: Queue full EPD update
-*/
+ */
 
 #include "button.hpp"
 #ifndef NO_MCP
 TaskHandle_t buttonTaskHandle = NULL;
-// Define a type for the event callback
 std::vector<EventCallback> buttonEventCallbacks; // Define a vector to hold multiple event callbacks
-volatile boolean buttonPressed = false;
+const TickType_t debounceDelay = pdMS_TO_TICKS(50);
+TickType_t lastDebounceTime = 0;
 
 void buttonTask(void *parameter)
 {
     while (1)
     {
-        if (!digitalRead(MCP_INT_PIN))
+        ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+        TickType_t currentTime = xTaskGetTickCount();
+        if ((currentTime - lastDebounceTime) >= debounceDelay)
         {
-            uint pin = mcp.getLastInterruptPin();
-            if (pin == 3) {
-              //  xTaskCreate(fullRefresh, "FullRefresh", 2048, NULL, 1, NULL); 
-              toggleScreenTimer();
-            }
-            else if (pin == 1)
-            {
-                previousScreen();
-            }
-            else if (pin == 2)
-            {
-                nextScreen();
-            }
-            else if (pin == 0)
-            {
-                showNetworkSettings();
-            }
+            lastDebounceTime = currentTime;
 
-            vTaskDelay(250); // debounce
-            mcp.clearInterrupts(); // clear
+            if (!digitalRead(MCP_INT_PIN))
+            {
+                uint pin = mcp.getLastInterruptPin();
+
+                switch (pin)
+                {
+                case 3:
+                    toggleScreenTimer();
+                    break;
+                case 2:
+                    nextScreen();
+                    break;
+                case 1:
+                    previousScreen();
+                    break;
+                case 0:
+                    showNetworkSettings();
+                    break;
+                }
+            }
+            mcp.clearInterrupts();
+            // Very ugly, but for some reason this is necessary
+            while (!digitalRead(MCP_INT_PIN))
+            {
+                mcp.clearInterrupts();
+            }
         }
-
-        vTaskDelay(pdMS_TO_TICKS(250));
     }
 }
 
 void IRAM_ATTR handleButtonInterrupt()
 {
-    buttonPressed = true;
-    // Serial.println(F("ISR"));
-    // uint pin = mcp.getLastInterruptPin();
-
-    // if (pin == 1)
-    // {
-    //     nextScreen();
-    // }
-    // else if (pin == 2)
-    // {
-    //     previousScreen();
-    // }
-    // vTaskDelay(pdMS_TO_TICKS(250));
-
-    // mcp.clearInterrupts();
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    xTaskNotifyFromISR(buttonTaskHandle, 0, eNoAction, &xHigherPriorityTaskWoken);
+    if (xHigherPriorityTaskWoken == pdTRUE)
+    {
+        portYIELD_FROM_ISR();
+    }
 }
 
 void setupButtonTask()
 {
     xTaskCreate(buttonTask, "ButtonTask", 4096, NULL, 1, &buttonTaskHandle); // Create the FreeRTOS task
     // Use interrupt instead of task
-    // attachInterrupt(MCP_INT_PIN, handleButtonInterrupt, FALLING);
+    attachInterrupt(MCP_INT_PIN, handleButtonInterrupt, CHANGE);
 }
 
 void registerNewButtonCallback(const EventCallback cb)
diff --git a/src/tasks/epd.cpp b/src/tasks/epd.cpp
index 0cfc422..a20739b 100644
--- a/src/tasks/epd.cpp
+++ b/src/tasks/epd.cpp
@@ -1,45 +1,80 @@
 #include "epd.hpp"
 
 #ifdef IS_S3
+#ifdef USE_UNIVERSAL_PIN
+Native_Pin EPD_CS[NUM_SCREENS] = {
+    Native_Pin(2),
+    Native_Pin(4),
+    Native_Pin(6),
+    Native_Pin(10),
+    Native_Pin(33),
+    Native_Pin(21),
+    Native_Pin(17),
+#if NUM_SCREENS == 9
+    // MCP23X17_Pin(mcp2, 7),
+    Native_Pin(-1),
+    Native_Pin(-1),
+#endif
+};
+Native_Pin EPD_BUSY[NUM_SCREENS] = {
+    Native_Pin(3),
+    Native_Pin(5),
+    Native_Pin(7),
+    Native_Pin(9),
+    Native_Pin(37),
+    Native_Pin(18),
+    Native_Pin(16),
+#if NUM_SCREENS == 9
+    //  MCP23X17_Pin(mcp2, 6),
+    Native_Pin(-1),
+    Native_Pin(-1),
+#endif
+};
+MCP23X17_Pin EPD_RESET_MPD[NUM_SCREENS] = {
+    MCP23X17_Pin(mcp, 8),
+    MCP23X17_Pin(mcp, 9),
+    MCP23X17_Pin(mcp, 10),
+    MCP23X17_Pin(mcp, 11),
+    MCP23X17_Pin(mcp, 12),
+    MCP23X17_Pin(mcp, 13),
+    MCP23X17_Pin(mcp, 14),
+#if NUM_SCREENS == 9
+    MCP23X17_Pin(mcp2, 2),
+    MCP23X17_Pin(mcp2, 5),
+// MCP23X17_Pin(mcp, 15),
+// MCP23X17_Pin(mcp, 16)
+#endif
+};
+
+#if NUM_SCREENS == 9
+MCP23X17_Pin EPD8_BUSY = MCP23X17_Pin(mcp2, 3);
+MCP23X17_Pin EPD8_CS = MCP23X17_Pin(mcp2, 4);
+MCP23X17_Pin EPD9_BUSY = MCP23X17_Pin(mcp2, 6);
+MCP23X17_Pin EPD9_CS = MCP23X17_Pin(mcp2, 7);
+#endif
+Native_Pin EPD_DC = Native_Pin(14);
+
+GxEPD2_BW<GxEPD2_213_B74, GxEPD2_213_B74::HEIGHT> displays[NUM_SCREENS] = {
+    GxEPD2_213_B74(&EPD_CS[0], &EPD_DC, &EPD_RESET_MPD[0], &EPD_BUSY[0]),
+    GxEPD2_213_B74(&EPD_CS[1], &EPD_DC, &EPD_RESET_MPD[1], &EPD_BUSY[1]),
+    GxEPD2_213_B74(&EPD_CS[2], &EPD_DC, &EPD_RESET_MPD[2], &EPD_BUSY[2]),
+    GxEPD2_213_B74(&EPD_CS[3], &EPD_DC, &EPD_RESET_MPD[3], &EPD_BUSY[3]),
+    GxEPD2_213_B74(&EPD_CS[4], &EPD_DC, &EPD_RESET_MPD[4], &EPD_BUSY[4]),
+    GxEPD2_213_B74(&EPD_CS[5], &EPD_DC, &EPD_RESET_MPD[5], &EPD_BUSY[5]),
+    GxEPD2_213_B74(&EPD_CS[6], &EPD_DC, &EPD_RESET_MPD[6], &EPD_BUSY[6]),
+#if NUM_SCREENS == 9
+    GxEPD2_213_B74(&EPD8_CS, &EPD_DC, &EPD_RESET_MPD[7], &EPD8_BUSY),
+    GxEPD2_213_B74(&EPD9_CS, &EPD_DC, &EPD_RESET_MPD[8], &EPD9_BUSY),
+#endif
+};
+#else
+// Non Universal Pin
 const char EPD_CS[NUM_SCREENS] = {2, 4, 6, 10, 33, 21, 17};
 const char EPD_BUSY[NUM_SCREENS] = {3, 5, 7, 9, 37, 18, 16};
 const char EPD_RESET_MPD[NUM_SCREENS] = {8, 9, 10, 11, 12, 13, 14};
 
 const char EPD_DC = 14;
 const char RST_PIN = 15;
-#elif defined(IS_S2)
-
-// reversed
-const int EPD_CS[7] = {17, 21, 33, 10, 6, 4, 2};
-const int EPD_BUSY[7] = {16, 18, 37, 9, 7, 5, 3};
-const int EPD_RESET_MPD[7] = {14, 13, 12, 11, 10, 9, 8};
-
-// const int EPD_CS[7] = {1, 4, 6, 8, 10, 13, 40};
-// const int EPD_BUSY[7] = {3, 5, 7, 9, 11, 12, 39};
-const int EPD_DC = 14;
-const int RST_PIN = 15;
-
-#elif defined(ARDUINO_ESP32S3_DEV)
-const int EPD_CS[7] = {40, 39, 9, 10, 3, 8, 18};
-const int EPD_BUSY[7] = {4, 5, 6, 7, 15, 16, 17};
-const int EPD_RESET_MPD[7] = {8, 9, 10, 11, 12, 13, 14};
-
-const int EPD_DC = 1;
-const int RST_PIN = 2;
-
-#else
-const int EPD_CS[7] = {21, 13, 5, 17, 4, 2, 15};
-const int EPD_BUSY[7] = {36, 39, 34, 35, 32, 33, 25};
-
-// const int EPD_CS[7] = {4, 14, 5, 17, 16, 4, 15};
-// const int EPD_BUSY[7] = {5, 27, 34, 35, 32, 33, 25};
-const int EPD_RESET_MPD[7] = {8, 9, 10, 11, 12, 13, 14};
-
-const int EPD_DC = 22;
-const int RST_PIN = 2;
-#endif
-
-#ifdef IS_BW
 
 GxEPD2_BW<GxEPD2_213_B74, GxEPD2_213_B74::HEIGHT> displays[NUM_SCREENS] = {
     GxEPD2_213_B74(EPD_CS[0], EPD_DC, /*RST=*/-1, EPD_BUSY[0]),
@@ -50,36 +85,16 @@ GxEPD2_BW<GxEPD2_213_B74, GxEPD2_213_B74::HEIGHT> displays[NUM_SCREENS] = {
     GxEPD2_213_B74(EPD_CS[5], EPD_DC, /*RST=*/-1, EPD_BUSY[5]),
     GxEPD2_213_B74(EPD_CS[6], EPD_DC, /*RST=*/-1, EPD_BUSY[6]),
 };
-
-// GxEPD2_BW<GxEPD2_213_B74, GxEPD2_213_B74::HEIGHT> * displays2 = (GxEPD2_BW<GxEPD2_213_B74, GxEPD2_213_B74::HEIGHT> *) ps_malloc(7 * sizeof (GxEPD2_BW<GxEPD2_213_B74, GxEPD2_213_B74::HEIGHT>));
-
+#endif
 const int SEM_WAIT_TIME = 10000;
-
-#else
-GxEPD2_3C<GxEPD2_213_Z98c, GxEPD2_213_Z98c::HEIGHT> displays[7] = {
-    GxEPD2_213_Z98c(EPD_CS[0], EPD_DC, /*RST=*/-1, EPD_BUSY[0]),
-    GxEPD2_213_Z98c(EPD_CS[1], EPD_DC, /*RST=*/-1, EPD_BUSY[1]),
-    GxEPD2_213_Z98c(EPD_CS[2], EPD_DC, /*RST=*/-1, EPD_BUSY[2]),
-    GxEPD2_213_Z98c(EPD_CS[3], EPD_DC, /*RST=*/-1, EPD_BUSY[3]),
-    GxEPD2_213_Z98c(EPD_CS[4], EPD_DC, /*RST=*/-1, EPD_BUSY[4]),
-    GxEPD2_213_Z98c(EPD_CS[5], EPD_DC, /*RST=*/-1, EPD_BUSY[5]),
-    GxEPD2_213_Z98c(EPD_CS[6], EPD_DC, /*RST=*/-1, EPD_BUSY[6]),
-};
-
-const int SEM_WAIT_TIME = 30000;
-
 #endif
 
 uint32_t lastFullRefresh[NUM_SCREENS];
 
-std::array<String, 7> currentEpdContent;
-std::array<String, 7> epdContent;
+std::array<String, NUM_SCREENS> currentEpdContent;
+std::array<String, NUM_SCREENS> epdContent;
 TaskHandle_t tasks[NUM_SCREENS];
 SemaphoreHandle_t epdUpdateSemaphore[NUM_SCREENS];
-//
-
-//int *qrcode = (int *) ps_malloc(qrcodegen_BUFFER_LEN_MAX * sizeof(uint8_t));
-
 
 void setupDisplays()
 {
@@ -87,49 +102,23 @@ void setupDisplays()
     xTaskCreate(taskEpd, "epd_task", 2048, NULL, 1, NULL);
 }
 
-void resetAllDisplays()
-{
-#ifdef NO_MCP
-    digitalWrite(RST_PIN, HIGH);
-    pinMode(RST_PIN, OUTPUT);
-    delay(20);
-    digitalWrite(RST_PIN, LOW);
-    delay(20);
-    digitalWrite(RST_PIN, HIGH);
-    delay(200);
-#else
-    for (int i = 0; i < NUM_SCREENS; i++)
-    {
-        resetSingleDisplay(i);
-    }
-#endif
-}
-
-void resetSingleDisplay(int i)
-{
-#ifndef NO_MCP
-    mcp.digitalWrite(EPD_RESET_MPD[i], HIGH);
-    delay(20);
-    mcp.digitalWrite(EPD_RESET_MPD[i], LOW);
-    delay(20);
-    mcp.digitalWrite(EPD_RESET_MPD[i], HIGH);
-    delay(200);
-#endif
-}
-
 void initDisplays()
 {
+    #ifndef USE_UNIVERSAL_PIN
+    resetAllDisplays();
+    #endif
+
     for (uint i = 0; i < NUM_SCREENS; i++)
     {
-#ifndef NO_MCP
+        #ifndef USE_UNIVERSAL_PIN
         mcp.pinMode(EPD_RESET_MPD[i], OUTPUT);
-#endif
-        displays[i].init();
-#ifndef NO_MCP
-        resetSingleDisplay(i);
-#endif
+        #endif
 
-        //  displays[i].epd2.init(SW_SCK, SW_MOSI, 115200, true, 20, false);
+        displays[i].init();
+
+        #ifndef USE_UNIVERSAL_PIN
+        resetSingleDisplay(i);
+        #endif
     }
 
     for (uint i = 0; i < NUM_SCREENS; i++)
@@ -144,7 +133,19 @@ void initDisplays()
         xTaskCreate(updateDisplay, "EpdUpd" + char(i), 4096, taskParam, 1, &tasks[i]); // create task
                                                                                        //  delay(1000);
     }
-    epdContent = {"B", "T", "C", "L", "O", "C", "K"};
+    epdContent = { "B",
+                   "T",
+                   "C",
+                   "L",
+                   "O",
+                   "C",
+                   "K"
+#if NUM_SCREENS == 9
+                   ,
+                   "0",
+                   "9"
+#endif
+    };
     for (uint i = 0; i < NUM_SCREENS; i++)
     {
         xTaskNotifyGive(tasks[i]);
@@ -152,6 +153,24 @@ void initDisplays()
     vTaskDelay(pdMS_TO_TICKS(displays[0].epd2.full_refresh_time));
 }
 
+void resetAllDisplays()
+{
+    for (int i = 0; i < NUM_SCREENS; i++)
+    {
+        resetSingleDisplay(i);
+    }
+}
+
+void resetSingleDisplay(int i)
+{
+    mcp.digitalWrite(EPD_RESET_MPD[i], HIGH);
+    delay(20);
+    mcp.digitalWrite(EPD_RESET_MPD[i], LOW);
+    delay(20);
+    mcp.digitalWrite(EPD_RESET_MPD[i], HIGH);
+    delay(200);
+}
+
 void taskEpd(void *pvParameters)
 {
     while (1)
@@ -173,6 +192,9 @@ void taskEpd(void *pvParameters)
         case SCREEN_HALVING_COUNTDOWN:
             epdContent = HalvingCountdownScreen::getEpdContent();
             break;
+        case SCREEN_MARKET_CAP:
+            epdContent = MarketCapScreen::getEpdContent();
+            break;
         case SCREEN_COUNTDOWN:
             epdContent = CountdownScreen::getEpdContent();
             break;
@@ -189,9 +211,6 @@ void taskEpd(void *pvParameters)
             {
                 if (!updatedThisCycle)
                 {
-#ifdef NO_MCP
-                    resetAllDisplays();
-#endif
                     updatedThisCycle = true;
                 }
 
@@ -222,12 +241,12 @@ void taskEpd(void *pvParameters)
     }
 }
 
-std::array<String, 7> getCurrentEpdContent()
+std::array<String, NUM_SCREENS> getCurrentEpdContent()
 {
     return currentEpdContent;
 }
 
-void setEpdContent(std::array<String, 7> newEpdContent)
+void setEpdContent(std::array<String, NUM_SCREENS> newEpdContent)
 {
     epdContent = newEpdContent;
 }
@@ -297,7 +316,7 @@ void fullRefresh(void *pvParameters)
     vTaskDelete(NULL);
 }
 
-void updateDisplay(void *pvParameters)
+extern "C" void updateDisplay(void *pvParameters) noexcept
 {
     const int epdIndex = *(int *)pvParameters;
     delete (int *)pvParameters;
@@ -309,12 +328,11 @@ void updateDisplay(void *pvParameters)
 
         if (epdContent[epdIndex].compareTo(currentEpdContent[epdIndex]) != 0)
         {
-            currentEpdContent[epdIndex] = epdContent[epdIndex];
-#ifndef NO_MCP
-            displays[epdIndex].init(0, false);
+            displays[epdIndex].init(0, false); // Little longer reset duration because of MCP
+            #ifndef USE_UNIVERSAL_PIN
             resetSingleDisplay(epdIndex);
-#endif
-            // displays[epdIndex].init(0, false);
+            #endif
+
             bool updatePartial = true;
 
             // Full Refresh every half hour
@@ -335,11 +353,28 @@ void updateDisplay(void *pvParameters)
                 showDigit(epdIndex, epdContent[epdIndex].c_str()[0], updatePartial, &FONT_BIG);
             }
 
-            displays[epdIndex].display(updatePartial);
-            displays[epdIndex].hibernate();
+            #ifdef USE_UNIVERSAL_PIN
+            char tries = 0;
+            while (tries < 3)
+            {
+                if (displays[epdIndex].displayWithReturn(updatePartial))
+                {
+                    displays[epdIndex].hibernate();
+                    currentEpdContent[epdIndex] = epdContent[epdIndex];
+                    break;
+                }
+
+                delay(100);
+                tries++;
+            }
+            #else
+                displays[epdIndex].display(updatePartial);
+                displays[epdIndex].hibernate();
+                currentEpdContent[epdIndex] = epdContent[epdIndex];
+            #endif
+
 #endif
         }
         xSemaphoreGive(epdUpdateSemaphore[epdIndex]);
     }
 }
-
diff --git a/src/tasks/epd.hpp b/src/tasks/epd.hpp
index 46b06cb..f1a7644 100644
--- a/src/tasks/epd.hpp
+++ b/src/tasks/epd.hpp
@@ -11,12 +11,18 @@
 #include "screens/blockheight.hpp"
 #include "screens/ticker.hpp"
 #include "screens/time.hpp"
-#include "screens/sats_per_dollar.hpp"
+#include "screens/market_cap.hpp"
 #include "screens/countdown.hpp"
 #include "screens/custom_text.hpp"
 #include "screens/halvingcountdown.hpp"
 
 
+#ifdef USE_UNIVERSAL_PIN
+#include <native_pin.hpp>
+#include <mcp23x17_pin.hpp>
+#include <universal_pin.hpp>
+#endif
+
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 
@@ -32,16 +38,16 @@ typedef struct {
 void setupDisplays();
 void initDisplays();
 void taskEpd(void *pvParameters);
+
+std::array<String, NUM_SCREENS> getCurrentEpdContent();
+
 void resetAllDisplays();
 void resetSingleDisplay(int i);
-
-std::array<String, 7> getCurrentEpdContent();
-
-void setEpdContent(std::array<String, 7> newEpdContent);
+void setEpdContent(std::array<String, NUM_SCREENS> newEpdContent);
 void splitText(const uint dispNum, String top, String bottom, bool partial);
 void showDigit(const uint dispNum, char chr, bool partial, const GFXfont *font);
 
 void refreshDisplay(void *pvParameters);
 void fullRefresh(void *pvParameters);
-void updateDisplay(void *pvParameters);
+extern "C" void updateDisplay(void *pvParameters) noexcept;
 //void genQrCode(String text, uint8_t *qrcode[qrcodegen_BUFFER_LEN_MAX]);
diff --git a/src/tasks/get_price.cpp b/src/tasks/get_price.cpp
index 86eb4fa..10aae6c 100644
--- a/src/tasks/get_price.cpp
+++ b/src/tasks/get_price.cpp
@@ -56,6 +56,9 @@ void taskGetPrice(void *pvParameters)
             {
                 Serial.print(F("Error retrieving BTC/USD price (CoinGecko). HTTP status code: "));
                 Serial.println(httpCode);
+                if (httpCode == -1) {
+                    WiFi.reconnect();
+                }
             }
         } else {
 
@@ -86,6 +89,9 @@ void taskGetPrice(void *pvParameters)
             {
                 Serial.print(F("Error retrieving BTC/USD price (CoinDesk). HTTP status code: "));
                 Serial.println(httpCode);
+                if (httpCode == -1) {
+                    WiFi.reconnect();
+                }
             }
         }
 
diff --git a/src/tasks/minute.cpp b/src/tasks/minute.cpp
index dc57bde..a676803 100644
--- a/src/tasks/minute.cpp
+++ b/src/tasks/minute.cpp
@@ -1,44 +1,59 @@
 #include "minute.hpp"
 
 TaskHandle_t minuteTaskHandle = NULL;
- // Define a type for the event callback
+// Define a type for the event callback
 std::vector<EventCallback> minuteEventCallbacks; // Define a vector to hold multiple event callbacks
-bool eventTriggered = false; // Initialize the event triggered flag to false
+bool eventTriggered = false;                     // Initialize the event triggered flag to false
+const int usPerMinute = 60 * 1000000;
 
-void minuteTask(void * parameter) {
-  while(1) {
-    #ifdef IS_3C // wait 5 minutes in case of a 3 color screen otherwise it keeps refreshing
-    if(rtc.getMinute() % 5 == 0 && !eventTriggered) {
-      eventTriggered = true;
-      for(auto &callback : minuteEventCallbacks) { // Loop through all the event callbacks and call them
-        callback();
-      }
+void minuteTask(void *parameter)
+{
+
+  esp_timer_handle_t minuteTimer;
+  const esp_timer_create_args_t minuteTimerConfig = {
+      .callback = &minuteTimerISR,
+      .name = "minute_timer"};
+
+  esp_timer_create(&minuteTimerConfig, &minuteTimer);
+
+  time_t currentTime;
+  struct tm timeinfo;
+  time(&currentTime);
+  localtime_r(&currentTime, &timeinfo);
+  uint32_t secondsUntilNextMinute = 60 - timeinfo.tm_sec;
+
+  if (secondsUntilNextMinute > 0)
+    vTaskDelay(pdMS_TO_TICKS((secondsUntilNextMinute * 1000)));
+
+  esp_timer_start_periodic(minuteTimer, usPerMinute);
+
+  while (1)
+  {
+    for (auto &callback : minuteEventCallbacks)
+    {
+      callback();
     }
-    if(rtc.getMinute() % 5 != 0 && eventTriggered) { // Reset the event triggered flag if the second is not 0
-      eventTriggered = false;
-    }
-    vTaskDelay(pdMS_TO_TICKS(1000)); // Sleep for 1000 milliseconds to avoid busy waiting
-    #else
-    if(rtc.getSecond() == 0 && !eventTriggered) {
-      eventTriggered = true;
-      for(auto &callback : minuteEventCallbacks) { // Loop through all the event callbacks and call them
-        callback();
-      }
-    }
-    if(rtc.getSecond() != 0) { // Reset the event triggered flag if the second is not 0
-      eventTriggered = false;
-    }
-    vTaskDelay(pdMS_TO_TICKS(500)); // Sleep for 500 milliseconds to avoid busy waiting
-    #endif
+
+    ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+  }
+}
+
+void IRAM_ATTR minuteTimerISR(void *arg)
+{
+  BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+  vTaskNotifyGiveFromISR(minuteTaskHandle, &xHigherPriorityTaskWoken);
+  if (xHigherPriorityTaskWoken == pdTRUE)
+  {
+    portYIELD_FROM_ISR();
   }
 }
 
 void setupMinuteEvent()
 {
-    xTaskCreate(minuteTask, "MinuteTask", 2048, NULL, 1, &minuteTaskHandle); // Create the FreeRTOS task
+  xTaskCreate(minuteTask, "MinuteTask", 4096, NULL, 1, &minuteTaskHandle); // Create the FreeRTOS task
 }
 
 void registerNewMinuteCallback(const EventCallback cb)
 {
   minuteEventCallbacks.push_back(cb);
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/tasks/minute.hpp b/src/tasks/minute.hpp
index 6a3a635..811200a 100644
--- a/src/tasks/minute.hpp
+++ b/src/tasks/minute.hpp
@@ -6,9 +6,13 @@
 #include <freertos/task.h>
 #include <vector>
 #include "shared.hpp"
+#include <esp_timer.h>
+#include <time.h>
 
 extern TaskHandle_t minuteTaskHandle;
 
 void minuteTask(void *pvParameters);
 void setupMinuteEvent();
+void IRAM_ATTR minuteTimerISR(void* arg);
+
 void registerNewMinuteCallback(const EventCallback cb);
\ No newline at end of file