diff --git a/source/Core/Inc/settingsGUI.hpp b/source/Core/Inc/settingsGUI.hpp
index f0c25297..f1d90852 100644
--- a/source/Core/Inc/settingsGUI.hpp
+++ b/source/Core/Inc/settingsGUI.hpp
@@ -8,9 +8,11 @@
 #ifndef GUI_HPP_
 #define GUI_HPP_
 #include "BSP.h"
+#include "FreeRTOS.h"
 #include "Settings.h"
 #include "Translation.h"
 
+
 #define PRESS_ACCEL_STEP         (TICKS_100MS / 3)
 #define PRESS_ACCEL_INTERVAL_MIN TICKS_100MS
 #define PRESS_ACCEL_INTERVAL_MAX (TICKS_100MS * 3)
@@ -35,7 +37,7 @@ typedef struct {
 } menuitem;
 
 void                  enterSettingsMenu();
-void                  warnUser(const char *warning, const int timeout);
+void                  warnUser(const char *warning, const TickType_t timeout);
 extern const menuitem rootSettingsMenu[];
 
 #endif /* GUI_HPP_ */
diff --git a/source/Core/Threads/OperatingModes/utils/OperatingModeUtilities.h b/source/Core/Threads/OperatingModes/utils/OperatingModeUtilities.h
index 4484ee0c..ab3f36f9 100644
--- a/source/Core/Threads/OperatingModes/utils/OperatingModeUtilities.h
+++ b/source/Core/Threads/OperatingModes/utils/OperatingModeUtilities.h
@@ -3,16 +3,16 @@
 #include "OLED.hpp"
 #include <stdbool.h>
 
-void     GUIDelay();                                         //
-bool     checkForUnderVoltage(void);                         //
-uint32_t getSleepTimeout(void);                              //
-bool     shouldBeSleeping(bool inAutoStart);                 //
-bool     shouldShutdown(void);                               //
-void     gui_drawTipTemp(bool symbol, const FontStyle font); //
-void     printVoltage(void);                                 //
-void     warnUser(const char *warning, const int timeout);   //
-void     gui_drawBatteryIcon(void);                          //
-bool     checkForUnderVoltage(void);                         //
-uint16_t min(uint16_t a, uint16_t b);                        //
-void     printCountdownUntilSleep(int sleepThres);           //
+void     GUIDelay();                                              //
+bool     checkForUnderVoltage(void);                              //
+uint32_t getSleepTimeout(void);                                   //
+bool     shouldBeSleeping(bool inAutoStart);                      //
+bool     shouldShutdown(void);                                    //
+void     gui_drawTipTemp(bool symbol, const FontStyle font);      //
+void     printVoltage(void);                                      //
+void     warnUser(const char *warning, const TickType_t timeout); //
+void     gui_drawBatteryIcon(void);                               //
+bool     checkForUnderVoltage(void);                              //
+uint16_t min(uint16_t a, uint16_t b);                             //
+void     printCountdownUntilSleep(int sleepThres);                //
 #endif
\ No newline at end of file
diff --git a/source/Core/Threads/OperatingModes/utils/ShowWarning.cpp b/source/Core/Threads/OperatingModes/utils/ShowWarning.cpp
index 58370cb7..fcd2972e 100644
--- a/source/Core/Threads/OperatingModes/utils/ShowWarning.cpp
+++ b/source/Core/Threads/OperatingModes/utils/ShowWarning.cpp
@@ -1,6 +1,6 @@
 #include "Buttons.hpp"
 #include "OperatingModeUtilities.h"
-void warnUser(const char *warning, const int timeout) {
+void warnUser(const char *warning, const TickType_t timeout) {
   OLED::clearScreen();
   OLED::printWholeScreen(warning);
   OLED::refresh();