diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fd8ece62a6..00f56d1060 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,6 +28,7 @@ endif ()
 set(CMAKE_OSX_SYSROOT "/")
 set(CMAKE_OSX_DEPLOYMENT_TARGET "")
 
+add_subdirectory(displayapp)
 
 set(SDK_SOURCE_FILES
         # Startup
@@ -420,12 +421,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingBluetooth.cpp
 
         ## Watch faces
-        displayapp/screens/WatchFaceAnalog.cpp
-        displayapp/screens/WatchFaceDigital.cpp
-        displayapp/screens/WatchFaceInfineat.cpp
-        displayapp/screens/WatchFaceTerminal.cpp
-        displayapp/screens/WatchFacePineTimeStyle.cpp
-        displayapp/screens/WatchFaceCasioStyleG7710.cpp
+        ${WATCHFACE_SOURCES}
 
         ##
 
@@ -848,8 +844,6 @@ target_compile_options(infinitime_fonts PUBLIC
         $<$<COMPILE_LANGUAGE:ASM>: ${ASM_FLAGS}>
         )
 
-add_subdirectory(displayapp/apps)
-
 # NRF SDK
 add_library(nrf-sdk STATIC ${SDK_SOURCE_FILES})
 target_include_directories(nrf-sdk SYSTEM PUBLIC . ../)
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 063120774a..a3a7a358c6 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -1,9 +1,12 @@
 #pragma once
 #include <cstdint>
 #include <bitset>
+#include <cstring>
+#include <array>
 #include "components/brightness/BrightnessController.h"
 #include "components/fs/FS.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
+#include "displayapp/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -60,15 +63,18 @@ namespace Pinetime {
       void Init();
       void SaveSettings();
 
-      void SetWatchFace(Pinetime::Applications::WatchFace face) {
-        if (face != settings.watchFace) {
+      void SetWatchFace(const char* face) {
+        const char* currentWatchFace = settings.watchFace.data();
+        if (std::strcmp(face, currentWatchFace) != 0) {
           settingsChanged = true;
+          auto len = std::min(std::strlen(face), Pinetime::Applications::MaxWatchFaceNameSize);
+          std::memcpy(settings.watchFace.data(), face, len);
+          settings.watchFace[len] = 0;
         }
-        settings.watchFace = face;
       };
 
-      Pinetime::Applications::WatchFace GetWatchFace() const {
-        return settings.watchFace;
+      const char* GetWatchFace() const {
+        return settings.watchFace.data();
       };
 
       void SetChimeOption(ChimesOption chimeOption) {
@@ -297,7 +303,7 @@ namespace Pinetime {
         WeatherFormat weatherFormat = WeatherFormat::Metric;
         Notification notificationStatus = Notification::On;
 
-        Pinetime::Applications::WatchFace watchFace = Pinetime::Applications::WatchFace::Digital;
+        std::array<char, Pinetime::Applications::MaxWatchFaceNameSize + 1> watchFace = {0};
         ChimesOption chimesOption = ChimesOption::None;
 
         PineTimeStyle PTS;
diff --git a/src/displayapp/apps/Apps.h.in b/src/displayapp/Apps.h.in
similarity index 69%
rename from src/displayapp/apps/Apps.h.in
rename to src/displayapp/Apps.h.in
index 2104a267c0..91d498c8a0 100644
--- a/src/displayapp/apps/Apps.h.in
+++ b/src/displayapp/Apps.h.in
@@ -45,35 +45,14 @@ namespace Pinetime {
       Error
     };
 
-    enum class WatchFace : uint8_t {
-      Digital,
-      Analog,
-      PineTimeStyle,
-      Terminal,
-      Infineat,
-      CasioStyleG7710,
-    };
-
     template <Apps>
     struct AppTraits {};
 
-    template <WatchFace>
-    struct WatchFaceTraits {};
-
     template <Apps... As>
     struct TypeList {
       static constexpr size_t Count = sizeof...(As);
     };
 
     using UserAppTypes = TypeList<@USERAPP_TYPES@>;
-
-    template <WatchFace... Ws>
-    struct WatchFaceTypeList {
-      static constexpr size_t Count = sizeof...(Ws);
-    };
-
-    using UserWatchFaceTypes = WatchFaceTypeList<@WATCHFACE_TYPES@>;
-
-    static_assert(UserWatchFaceTypes::Count >= 1);
   }
 }
diff --git a/src/displayapp/CMakeLists.txt b/src/displayapp/CMakeLists.txt
new file mode 100644
index 0000000000..5f9b737b82
--- /dev/null
+++ b/src/displayapp/CMakeLists.txt
@@ -0,0 +1,66 @@
+if(DEFINED ENABLE_USERAPPS)
+    set(USERAPP_TYPES ${ENABLE_USERAPPS} CACHE STRING "List of user apps to build into the firmware")
+else ()
+    set(DEFAULT_USER_APP_TYPES "Apps::StopWatch")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Alarm")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Timer")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Steps")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::HeartRate")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Music")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Paint")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Paddle")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Twos")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Dice")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Metronome")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Navigation")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather")
+    #set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion")
+    set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware")
+endif ()
+
+if(NOT DEFINED DEFAULT_WATCHFACE_NAMES )
+    set(DEFAULT_WATCHFACE_NAMES "digital;analog;pinetimestyle;terminal;infineat;casioStyleG7710")
+endif()
+message("WATCH FACES\n-----------")
+foreach(item ${DEFAULT_WATCHFACE_NAMES})
+    if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/watchfaces/${item})
+        add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/watchfaces/${item})
+        message("    * Watch face ${INFINITIME_WATCHFACE_NAME} enabled!")
+        list(APPEND DEFAULT_WATCHFACE_TYPES "${INFINITIME_WATCHFACE_NAMESPACE}")
+        list(APPEND WATCHFACE_SOURCES_LIST "${INFINITIME_WATCHFACE_SOURCES}")
+        string(APPEND WATCHFACE_INCLUDE "#include \"${INFINITIME_WATCHFACE_INCLUDES}\"\n")
+    endif()
+endforeach()
+set(WATCHFACE_SOURCES ${WATCHFACE_SOURCES_LIST} PARENT_SCOPE)
+
+# Generate the list of watchface types necessary to instantiate WatchFaceTypeList<> needed in WatchFace.h
+set(FIRST_ITERATION TRUE)
+foreach (watchface IN LISTS DEFAULT_WATCHFACE_TYPES)
+    if (${FIRST_ITERATION})
+        string(APPEND WATCHFACE_TYPES "${watchface}")
+        set(FIRST_ITERATION FALSE)
+    else ()
+        string(APPEND WATCHFACE_TYPES ", ${watchface}")
+    endif ()
+endforeach ()
+
+# Generate the forward declarations needed in WatchFace.h
+foreach (w IN LISTS DEFAULT_WATCHFACE_TYPES)
+    string(FIND ${w} "::" classIndex REVERSE)
+    string(LENGTH ${w} watchfaceFullLength)
+    math(EXPR watchfaceLength "${watchfaceFullLength} - (${classIndex} + 2)")
+    math(EXPR beginIndex "${classIndex}+2")
+    string(SUBSTRING ${w} ${beginIndex} ${watchfaceLength} className)
+    string(SUBSTRING ${w} 0 ${classIndex} namespaceName)
+    string(APPEND WATCHFACE_NAMESPACE "namespace ${namespaceName} { class ${className}; }\n")
+endforeach ()
+
+add_library(infinitime_apps INTERFACE)
+target_sources(infinitime_apps INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/Apps.h")
+target_include_directories(infinitime_apps INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/")
+target_include_directories(infinitime_apps INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/../")
+
+# Generate the list of user apps to be compiled into the firmware
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Apps.h.in ${CMAKE_CURRENT_BINARY_DIR}/Apps.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/WatchFaces.h.in ${CMAKE_CURRENT_BINARY_DIR}/WatchFaces.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/UserApps.h.in ${CMAKE_CURRENT_BINARY_DIR}/UserApps.h)
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index f3f0bd934b..62e8646fb6 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -439,7 +439,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
     case Apps::Clock: {
       const auto* watchFace =
         std::find_if(userWatchFaces.begin(), userWatchFaces.end(), [this](const WatchFaceDescription& watchfaceDescription) {
-          return watchfaceDescription.watchFace == settingsController.GetWatchFace();
+          return std::strcmp(watchfaceDescription.name, settingsController.GetWatchFace()) == 0;
         });
       if (watchFace != userWatchFaces.end())
         currentScreen.reset(watchFace->create(controllers));
@@ -494,8 +494,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
       std::array<Screens::SettingWatchFace::Item, UserWatchFaceTypes::Count> items;
       int i = 0;
       for (const auto& userWatchFace : userWatchFaces) {
-        items[i++] =
-          Screens::SettingWatchFace::Item {userWatchFace.name, userWatchFace.watchFace, userWatchFace.isAvailable(controllers.filesystem)};
+        items[i++] = Screens::SettingWatchFace::Item {userWatchFace.name, userWatchFace.isAvailable(controllers.filesystem)};
       }
       currentScreen = std::make_unique<Screens::SettingWatchFace>(this, std::move(items), settingsController, filesystem);
     } break;
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 96bce4dd1d..349ca01424 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -4,7 +4,7 @@
 #include <task.h>
 #include <memory>
 #include <systemtask/Messages.h>
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/LittleVgl.h"
 #include "displayapp/TouchEvents.h"
 #include "components/brightness/BrightnessController.h"
diff --git a/src/displayapp/UserApps.h b/src/displayapp/UserApps.h.in
similarity index 67%
rename from src/displayapp/UserApps.h
rename to src/displayapp/UserApps.h.in
index 67bbfa7d41..3e20dd20b6 100644
--- a/src/displayapp/UserApps.h
+++ b/src/displayapp/UserApps.h.in
@@ -1,19 +1,13 @@
 #pragma once
-#include "displayapp/apps/Apps.h"
-#include "Controllers.h"
+#include "displayapp/Apps.h"
+#include "displayapp/Controllers.h"
 
 #include "displayapp/screens/Alarm.h"
 #include "displayapp/screens/Dice.h"
 #include "displayapp/screens/Timer.h"
 #include "displayapp/screens/Twos.h"
 #include "displayapp/screens/Tile.h"
-#include "displayapp/screens/ApplicationList.h"
-#include "displayapp/screens/WatchFaceDigital.h"
-#include "displayapp/screens/WatchFaceAnalog.h"
-#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
-#include "displayapp/screens/WatchFaceInfineat.h"
-#include "displayapp/screens/WatchFacePineTimeStyle.h"
-#include "displayapp/screens/WatchFaceTerminal.h"
+@WATCHFACE_INCLUDE@
 
 namespace Pinetime {
   namespace Applications {
@@ -28,7 +22,6 @@ namespace Pinetime {
     };
 
     struct WatchFaceDescription {
-      WatchFace watchFace;
       const char* name;
       Screens::Screen* (*create)(AppControllers& controllers);
       bool (*isAvailable)(Controllers::FS& fileSystem);
@@ -39,9 +32,11 @@ namespace Pinetime {
       return {AppTraits<t>::app, AppTraits<t>::icon, &AppTraits<t>::Create};
     }
 
-    template <WatchFace t>
+    template <class t>
     consteval WatchFaceDescription CreateWatchFaceDescription() {
-      return {WatchFaceTraits<t>::watchFace, WatchFaceTraits<t>::name, &WatchFaceTraits<t>::Create, &WatchFaceTraits<t>::IsAvailable};
+      static_assert(std::char_traits<char>::length(WatchFaceTraits<t>::name) < 16,
+                    "The name of the watch faces is limited to 15 characters max");
+      return {WatchFaceTraits<t>::name, &WatchFaceTraits<t>::Create, &WatchFaceTraits<t>::IsAvailable};
     }
 
     template <template <Apps...> typename T, Apps... ts>
@@ -49,7 +44,7 @@ namespace Pinetime {
       return {CreateAppDescription<ts>()...};
     }
 
-    template <template <WatchFace...> typename T, WatchFace... ts>
+    template <template <class...> typename T, class... ts>
     consteval std::array<WatchFaceDescription, sizeof...(ts)> CreateWatchFaceDescriptions(T<ts...>) {
       return {CreateWatchFaceDescription<ts>()...};
     }
diff --git a/src/displayapp/WatchFaces.h.in b/src/displayapp/WatchFaces.h.in
new file mode 100644
index 0000000000..4d3e274c5d
--- /dev/null
+++ b/src/displayapp/WatchFaces.h.in
@@ -0,0 +1,22 @@
+#pragma once
+#include <cstddef>
+#include <cstdint>
+
+@WATCHFACE_NAMESPACE@
+namespace Pinetime {
+  namespace Applications {
+    static constexpr size_t MaxWatchFaceNameSize = 15;
+
+    template <class T>
+    struct WatchFaceTraits {};
+
+    template <class... Ws>
+    struct WatchFaceTypeList {
+      static constexpr size_t Count = sizeof...(Ws);
+    };
+
+    using UserWatchFaceTypes = WatchFaceTypeList<@WATCHFACE_TYPES@>;
+
+    static_assert(UserWatchFaceTypes::Count >= 1);
+  }
+}
diff --git a/src/displayapp/apps/CMakeLists.txt b/src/displayapp/apps/CMakeLists.txt
deleted file mode 100644
index d78587609e..0000000000
--- a/src/displayapp/apps/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-if(DEFINED ENABLE_USERAPPS)
-    set(USERAPP_TYPES ${ENABLE_USERAPPS} CACHE STRING "List of user apps to build into the firmware")
-else ()
-    set(DEFAULT_USER_APP_TYPES "Apps::StopWatch")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Alarm")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Timer")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Steps")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::HeartRate")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Music")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Paint")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Paddle")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Twos")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Dice")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Metronome")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Navigation")
-    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather")
-    #set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion")
-    set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware")
-endif ()
-
-if(DEFINED ENABLE_WATCHFACES)
-    set(WATCHFACE_TYPES ${ENABLE_WATCHFACES} CACHE STRING "List of watch faces to build into the firmware")
-else()
-    set(DEFAULT_WATCHFACE_TYPES "WatchFace::Digital")
-    set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Analog")
-    set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::PineTimeStyle")
-    set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Terminal")
-    set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::Infineat")
-    set(DEFAULT_WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}, WatchFace::CasioStyleG7710")
-    set(WATCHFACE_TYPES "${DEFAULT_WATCHFACE_TYPES}" CACHE STRING "List of watch faces to build into the firmware")
-endif()
-
-add_library(infinitime_apps INTERFACE)
-target_sources(infinitime_apps INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/Apps.h")
-target_include_directories(infinitime_apps INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/")
-
-# Generate the list of user apps to be compiled into the firmware
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Apps.h.in ${CMAKE_CURRENT_BINARY_DIR}/Apps.h)
diff --git a/src/displayapp/screens/Alarm.h b/src/displayapp/screens/Alarm.h
index 444102cb01..0244df232c 100644
--- a/src/displayapp/screens/Alarm.h
+++ b/src/displayapp/screens/Alarm.h
@@ -17,7 +17,7 @@
 */
 #pragma once
 
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
 #include "displayapp/widgets/Counter.h"
diff --git a/src/displayapp/screens/ApplicationList.h b/src/displayapp/screens/ApplicationList.h
index 41a413af1a..1f74cc1e11 100644
--- a/src/displayapp/screens/ApplicationList.h
+++ b/src/displayapp/screens/ApplicationList.h
@@ -2,7 +2,6 @@
 
 #include <array>
 #include <memory>
-#include "displayapp/apps/Apps.h"
 #include "Screen.h"
 #include "ScreenList.h"
 #include "displayapp/Controllers.h"
diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h
index c6119970a1..7530f72435 100644
--- a/src/displayapp/screens/CheckboxList.h
+++ b/src/displayapp/screens/CheckboxList.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "displayapp/apps/Apps.h"
 #include "displayapp/screens/Screen.h"
 #include <array>
 #include <cstdint>
diff --git a/src/displayapp/screens/Dice.h b/src/displayapp/screens/Dice.h
index da91657d0c..ab0955a6f7 100644
--- a/src/displayapp/screens/Dice.h
+++ b/src/displayapp/screens/Dice.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/screens/Screen.h"
 #include "displayapp/widgets/Counter.h"
 #include "displayapp/Controllers.h"
diff --git a/src/displayapp/screens/InfiniPaint.h b/src/displayapp/screens/InfiniPaint.h
index b1f9741a02..3de0066f71 100644
--- a/src/displayapp/screens/InfiniPaint.h
+++ b/src/displayapp/screens/InfiniPaint.h
@@ -6,7 +6,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/motor/MotorController.h"
 #include "Symbols.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include <displayapp/Controllers.h>
 
 namespace Pinetime {
diff --git a/src/displayapp/screens/List.h b/src/displayapp/screens/List.h
index 17a25f8209..cafd5634ac 100644
--- a/src/displayapp/screens/List.h
+++ b/src/displayapp/screens/List.h
@@ -5,7 +5,6 @@
 #include <array>
 #include "displayapp/screens/Screen.h"
 #include "displayapp/widgets/PageIndicator.h"
-#include "displayapp/apps/Apps.h"
 #include "components/settings/Settings.h"
 
 #define MAXLISTITEMS 4
diff --git a/src/displayapp/screens/Motion.h b/src/displayapp/screens/Motion.h
index e13e068cd9..9cd126f440 100644
--- a/src/displayapp/screens/Motion.h
+++ b/src/displayapp/screens/Motion.h
@@ -7,7 +7,7 @@
 #include <lvgl/src/lv_core/lv_obj.h>
 #include <components/motion/MotionController.h>
 #include "displayapp/Controllers.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 
 namespace Pinetime {
   namespace Applications {
diff --git a/src/displayapp/screens/Music.h b/src/displayapp/screens/Music.h
index 522533215b..062bd968af 100644
--- a/src/displayapp/screens/Music.h
+++ b/src/displayapp/screens/Music.h
@@ -21,7 +21,7 @@
 #include <lvgl/src/lv_core/lv_obj.h>
 #include <string>
 #include "displayapp/screens/Screen.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 
diff --git a/src/displayapp/screens/Navigation.h b/src/displayapp/screens/Navigation.h
index 5c7a04299f..e62745b2ca 100644
--- a/src/displayapp/screens/Navigation.h
+++ b/src/displayapp/screens/Navigation.h
@@ -22,7 +22,7 @@
 #include <string>
 #include "displayapp/screens/Screen.h"
 #include <array>
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 
diff --git a/src/displayapp/screens/Paddle.h b/src/displayapp/screens/Paddle.h
index 586cccf4cf..1ea2515881 100644
--- a/src/displayapp/screens/Paddle.h
+++ b/src/displayapp/screens/Paddle.h
@@ -3,7 +3,7 @@
 #include <lvgl/lvgl.h>
 #include <cstdint>
 #include "displayapp/screens/Screen.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 
diff --git a/src/displayapp/screens/Steps.h b/src/displayapp/screens/Steps.h
index 6443582f5e..428e4b2980 100644
--- a/src/displayapp/screens/Steps.h
+++ b/src/displayapp/screens/Steps.h
@@ -4,7 +4,7 @@
 #include <lvgl/lvgl.h>
 #include "displayapp/screens/Screen.h"
 #include <components/motion/MotionController.h>
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 
diff --git a/src/displayapp/screens/StopWatch.h b/src/displayapp/screens/StopWatch.h
index 3386d042b8..b3bbba8744 100644
--- a/src/displayapp/screens/StopWatch.h
+++ b/src/displayapp/screens/StopWatch.h
@@ -7,7 +7,7 @@
 #include "portmacro_cmsis.h"
 
 #include "systemtask/SystemTask.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 
diff --git a/src/displayapp/screens/Tile.h b/src/displayapp/screens/Tile.h
index f1b86246ce..deac9a1493 100644
--- a/src/displayapp/screens/Tile.h
+++ b/src/displayapp/screens/Tile.h
@@ -4,7 +4,6 @@
 #include <cstdint>
 #include <memory>
 #include "displayapp/screens/Screen.h"
-#include "displayapp/apps/Apps.h"
 #include "components/datetime/DateTimeController.h"
 #include "components/settings/Settings.h"
 #include "components/battery/BatteryController.h"
diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h
index 52449fd36c..d983d13640 100644
--- a/src/displayapp/screens/Twos.h
+++ b/src/displayapp/screens/Twos.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/screens/Screen.h"
 #include "displayapp/Controllers.h"
 
diff --git a/src/displayapp/screens/Weather.h b/src/displayapp/screens/Weather.h
index 6975311e06..dd294d24a9 100644
--- a/src/displayapp/screens/Weather.h
+++ b/src/displayapp/screens/Weather.h
@@ -4,7 +4,7 @@
 #include <lvgl/lvgl.h>
 #include "displayapp/screens/Screen.h"
 #include "components/ble/SimpleWeatherService.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/Controllers.h"
 #include "Symbols.h"
 #include "utility/DirtyValue.h"
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index e01e9f847d..749dd325c0 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -12,12 +12,12 @@ constexpr const char* SettingWatchFace::symbol;
 namespace {
   uint32_t IndexOf(const std::array<Pinetime::Applications::Screens::SettingWatchFace::Item,
                                     Pinetime::Applications::UserWatchFaceTypes::Count>& watchfaces,
-                   Pinetime::Applications::WatchFace watchface) {
+                   const char* watchface) {
     size_t index = 0;
     auto found = std::find_if(watchfaces.begin(),
                               watchfaces.end(),
-                              [&index, &watchface](const Pinetime::Applications::Screens::SettingWatchFace::Item& item) {
-                                const bool result = item.watchface == watchface;
+                              [&index, watchface](const Pinetime::Applications::Screens::SettingWatchFace::Item& item) {
+                                const bool result = (std::strcmp(item.name, watchface) == 0);
                                 if (!result) {
                                   index++;
                                 }
@@ -30,13 +30,13 @@ namespace {
     return index;
   }
 
-  Pinetime::Applications::WatchFace IndexToWatchFace(const std::array<Pinetime::Applications::Screens::SettingWatchFace::Item,
-                                                                      Pinetime::Applications::UserWatchFaceTypes::Count>& watchfaces,
+  const char* IndexToWatchFace(const std::array<Pinetime::Applications::Screens::SettingWatchFace::Item,
+                                                Pinetime::Applications::UserWatchFaceTypes::Count>& watchfaces,
                                                      size_t index) {
     if (index >= watchfaces.size()) {
-      return watchfaces[0].watchface;
+      return watchfaces[0].name;
     }
-    return watchfaces[index].watchface;
+    return watchfaces[index].name;
   }
 }
 
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index 4c75b0ab21..47069076a5 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -9,8 +9,7 @@
 #include "displayapp/screens/Screen.h"
 #include "displayapp/screens/Symbols.h"
 #include "displayapp/screens/CheckboxList.h"
-#include "displayapp/screens/WatchFaceInfineat.h"
-#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
+#include "displayapp/WatchFaces.h"
 
 namespace Pinetime {
 
@@ -21,7 +20,6 @@ namespace Pinetime {
       public:
         struct Item {
           const char* name;
-          WatchFace watchface;
           bool enabled;
         };
 
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index cb5ba413e8..065417fa7c 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -1,7 +1,7 @@
 #include "displayapp/screens/settings/Settings.h"
 #include <lvgl/lvgl.h>
 #include <functional>
-#include "displayapp/apps/Apps.h"
+#include "displayapp/Apps.h"
 #include "displayapp/DisplayApp.h"
 
 using namespace Pinetime::Applications::Screens;
diff --git a/src/displayapp/watchfaces/analog/CMakeLists.txt b/src/displayapp/watchfaces/analog/CMakeLists.txt
new file mode 100644
index 0000000000..879a2e56c2
--- /dev/null
+++ b/src/displayapp/watchfaces/analog/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(INFINITIME_WATCHFACE_NAME "Analog" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceAnalog" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/analog/WatchFaceAnalog.h" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/analog/WatchFaceAnalog.cpp" PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/watchfaces/analog/WatchFaceAnalog.cpp
similarity index 99%
rename from src/displayapp/screens/WatchFaceAnalog.cpp
rename to src/displayapp/watchfaces/analog/WatchFaceAnalog.cpp
index 2b27ad6402..93048b0b2d 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/watchfaces/analog/WatchFaceAnalog.cpp
@@ -1,4 +1,4 @@
-#include "displayapp/screens/WatchFaceAnalog.h"
+#include "displayapp/watchfaces/analog/WatchFaceAnalog.h"
 #include <cmath>
 #include <lvgl/lvgl.h>
 #include "displayapp/screens/BatteryIcon.h"
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/watchfaces/analog/WatchFaceAnalog.h
similarity index 96%
rename from src/displayapp/screens/WatchFaceAnalog.h
rename to src/displayapp/watchfaces/analog/WatchFaceAnalog.h
index 89ad4e1346..fd43d05453 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/watchfaces/analog/WatchFaceAnalog.h
@@ -11,6 +11,7 @@
 #include "components/ble/NotificationManager.h"
 #include "displayapp/screens/BatteryIcon.h"
 #include "utility/DirtyValue.h"
+#include "displayapp/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -90,8 +91,7 @@ namespace Pinetime {
     }
 
     template <>
-    struct WatchFaceTraits<WatchFace::Analog> {
-      static constexpr WatchFace watchFace = WatchFace::Analog;
+    struct WatchFaceTraits<Screens::WatchFaceAnalog> {
       static constexpr const char* name = "Analog face";
 
       static Screens::Screen* Create(AppControllers& controllers) {
diff --git a/src/displayapp/watchfaces/casioStyleG7710/CMakeLists.txt b/src/displayapp/watchfaces/casioStyleG7710/CMakeLists.txt
new file mode 100644
index 0000000000..4fe217b260
--- /dev/null
+++ b/src/displayapp/watchfaces/casioStyleG7710/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(INFINITIME_WATCHFACE_NAME "CasioStyleG7710" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceCasioStyleG7710" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.cpp" PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.cpp
similarity index 99%
rename from src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
rename to src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.cpp
index 72bfaaa329..89b0f028c2 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
+++ b/src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.cpp
@@ -1,4 +1,4 @@
-#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
+#include "displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h"
 
 #include <lvgl/lvgl.h>
 #include <cstdio>
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h
similarity index 96%
rename from src/displayapp/screens/WatchFaceCasioStyleG7710.h
rename to src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h
index f10e931ce4..66da0cb6bf 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h
+++ b/src/displayapp/watchfaces/casioStyleG7710/WatchFaceCasioStyleG7710.h
@@ -10,7 +10,7 @@
 #include "components/datetime/DateTimeController.h"
 #include "components/ble/BleController.h"
 #include "utility/DirtyValue.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -104,8 +104,7 @@ namespace Pinetime {
     }
 
     template <>
-    struct WatchFaceTraits<WatchFace::CasioStyleG7710> {
-      static constexpr WatchFace watchFace = WatchFace::CasioStyleG7710;
+    struct WatchFaceTraits<Screens::WatchFaceCasioStyleG7710> {
       static constexpr const char* name = "Casio G7710";
 
       static Screens::Screen* Create(AppControllers& controllers) {
diff --git a/src/displayapp/watchfaces/digital/CMakeLists.txt b/src/displayapp/watchfaces/digital/CMakeLists.txt
new file mode 100644
index 0000000000..83b581dfee
--- /dev/null
+++ b/src/displayapp/watchfaces/digital/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(INFINITIME_WATCHFACE_NAME "Digital" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceDigital" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/digital/WatchFaceDigital.h" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/digital/WatchFaceDigital.cpp" PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/watchfaces/digital/WatchFaceDigital.cpp
similarity index 99%
rename from src/displayapp/screens/WatchFaceDigital.cpp
rename to src/displayapp/watchfaces/digital/WatchFaceDigital.cpp
index afe00fa5d0..04bd7b4f46 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/watchfaces/digital/WatchFaceDigital.cpp
@@ -1,4 +1,4 @@
-#include "displayapp/screens/WatchFaceDigital.h"
+#include "displayapp/watchfaces/digital/WatchFaceDigital.h"
 
 #include <lvgl/lvgl.h>
 #include <cstdio>
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/watchfaces/digital/WatchFaceDigital.h
similarity index 96%
rename from src/displayapp/screens/WatchFaceDigital.h
rename to src/displayapp/watchfaces/digital/WatchFaceDigital.h
index 3ff78c8aec..f9fdd407b7 100644
--- a/src/displayapp/screens/WatchFaceDigital.h
+++ b/src/displayapp/watchfaces/digital/WatchFaceDigital.h
@@ -10,7 +10,7 @@
 #include "components/ble/BleController.h"
 #include "displayapp/widgets/StatusIcons.h"
 #include "utility/DirtyValue.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -81,8 +81,7 @@ namespace Pinetime {
     }
 
     template <>
-    struct WatchFaceTraits<WatchFace::Digital> {
-      static constexpr WatchFace watchFace = WatchFace::Digital;
+    struct WatchFaceTraits<Screens::WatchFaceDigital> {
       static constexpr const char* name = "Digital face";
 
       static Screens::Screen* Create(AppControllers& controllers) {
diff --git a/src/displayapp/watchfaces/infineat/CMakeLists.txt b/src/displayapp/watchfaces/infineat/CMakeLists.txt
new file mode 100644
index 0000000000..ad741c565b
--- /dev/null
+++ b/src/displayapp/watchfaces/infineat/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(INFINITIME_WATCHFACE_NAME "Infineat" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceInfineat" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/infineat/WatchFaceInfineat.h" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/infineat/WatchFaceInfineat.cpp" PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/watchfaces/infineat/WatchFaceInfineat.cpp
similarity index 99%
rename from src/displayapp/screens/WatchFaceInfineat.cpp
rename to src/displayapp/watchfaces/infineat/WatchFaceInfineat.cpp
index c643f3bd79..cde82e6828 100644
--- a/src/displayapp/screens/WatchFaceInfineat.cpp
+++ b/src/displayapp/watchfaces/infineat/WatchFaceInfineat.cpp
@@ -1,4 +1,4 @@
-#include "displayapp/screens/WatchFaceInfineat.h"
+#include "displayapp/watchfaces/infineat/WatchFaceInfineat.h"
 
 #include <lvgl/lvgl.h>
 #include <cstdio>
diff --git a/src/displayapp/screens/WatchFaceInfineat.h b/src/displayapp/watchfaces/infineat/WatchFaceInfineat.h
similarity index 96%
rename from src/displayapp/screens/WatchFaceInfineat.h
rename to src/displayapp/watchfaces/infineat/WatchFaceInfineat.h
index 32c08f1887..2e41483285 100644
--- a/src/displayapp/screens/WatchFaceInfineat.h
+++ b/src/displayapp/watchfaces/infineat/WatchFaceInfineat.h
@@ -8,7 +8,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/datetime/DateTimeController.h"
 #include "utility/DirtyValue.h"
-#include "displayapp/apps/Apps.h"
+#include "displayapp/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -102,8 +102,7 @@ namespace Pinetime {
     }
 
     template <>
-    struct WatchFaceTraits<WatchFace::Infineat> {
-      static constexpr WatchFace watchFace = WatchFace::Infineat;
+    struct WatchFaceTraits<Screens::WatchFaceInfineat> {
       static constexpr const char* name = "Infineat face";
 
       static Screens::Screen* Create(AppControllers& controllers) {
diff --git a/src/displayapp/watchfaces/pinetimestyle/CMakeLists.txt b/src/displayapp/watchfaces/pinetimestyle/CMakeLists.txt
new file mode 100644
index 0000000000..cc9c87f3f8
--- /dev/null
+++ b/src/displayapp/watchfaces/pinetimestyle/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(INFINITIME_WATCHFACE_NAME "PineTimeStyle" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFacePineTimeStyle" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.cpp" PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.cpp b/src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.cpp
similarity index 99%
rename from src/displayapp/screens/WatchFacePineTimeStyle.cpp
rename to src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.cpp
index e56031f74a..0291ce6b7b 100644
--- a/src/displayapp/screens/WatchFacePineTimeStyle.cpp
+++ b/src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.cpp
@@ -19,7 +19,7 @@
  * Style/layout copied from TimeStyle for Pebble by Dan Tilden (github.com/tilden)
  */
 
-#include "displayapp/screens/WatchFacePineTimeStyle.h"
+#include "displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h"
 #include <lvgl/lvgl.h>
 #include <cstdio>
 #include <displayapp/Colors.h>
diff --git a/src/displayapp/screens/WatchFacePineTimeStyle.h b/src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h
similarity index 97%
rename from src/displayapp/screens/WatchFacePineTimeStyle.h
rename to src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h
index 72537095f9..f6b04a4bdb 100644
--- a/src/displayapp/screens/WatchFacePineTimeStyle.h
+++ b/src/displayapp/watchfaces/pinetimestyle/WatchFacePineTimeStyle.h
@@ -12,6 +12,7 @@
 #include "components/ble/SimpleWeatherService.h"
 #include "components/ble/BleController.h"
 #include "utility/DirtyValue.h"
+#include "displayapp/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -122,8 +123,7 @@ namespace Pinetime {
     }
 
     template <>
-    struct WatchFaceTraits<WatchFace::PineTimeStyle> {
-      static constexpr WatchFace watchFace = WatchFace::PineTimeStyle;
+    struct WatchFaceTraits<Screens::WatchFacePineTimeStyle> {
       static constexpr const char* name = "PineTimeStyle";
 
       static Screens::Screen* Create(AppControllers& controllers) {
diff --git a/src/displayapp/watchfaces/terminal/CMakeLists.txt b/src/displayapp/watchfaces/terminal/CMakeLists.txt
new file mode 100644
index 0000000000..3347c033a9
--- /dev/null
+++ b/src/displayapp/watchfaces/terminal/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(INFINITIME_WATCHFACE_NAME "Terminal" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_NAMESPACE "Pinetime::Applications::Screens::WatchFaceTerminal" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_INCLUDES "displayapp/watchfaces/terminal/WatchFaceTerminal.h" PARENT_SCOPE)
+set(INFINITIME_WATCHFACE_SOURCES "displayapp/watchfaces/terminal/WatchFaceTerminal.cpp" PARENT_SCOPE)
\ No newline at end of file
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/watchfaces/terminal/WatchFaceTerminal.cpp
similarity index 99%
rename from src/displayapp/screens/WatchFaceTerminal.cpp
rename to src/displayapp/watchfaces/terminal/WatchFaceTerminal.cpp
index 723837299b..1a7296282e 100644
--- a/src/displayapp/screens/WatchFaceTerminal.cpp
+++ b/src/displayapp/watchfaces/terminal/WatchFaceTerminal.cpp
@@ -1,5 +1,5 @@
 #include <lvgl/lvgl.h>
-#include "displayapp/screens/WatchFaceTerminal.h"
+#include "displayapp/watchfaces/terminal/WatchFaceTerminal.h"
 #include "displayapp/screens/BatteryIcon.h"
 #include "displayapp/screens/NotificationIcon.h"
 #include "displayapp/screens/Symbols.h"
diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/watchfaces/terminal/WatchFaceTerminal.h
similarity index 96%
rename from src/displayapp/screens/WatchFaceTerminal.h
rename to src/displayapp/watchfaces/terminal/WatchFaceTerminal.h
index ce22005fb9..1d4cbffe72 100644
--- a/src/displayapp/screens/WatchFaceTerminal.h
+++ b/src/displayapp/watchfaces/terminal/WatchFaceTerminal.h
@@ -8,6 +8,7 @@
 #include "displayapp/screens/Screen.h"
 #include "components/datetime/DateTimeController.h"
 #include "utility/DirtyValue.h"
+#include "displayapp/WatchFaces.h"
 
 namespace Pinetime {
   namespace Controllers {
@@ -71,8 +72,7 @@ namespace Pinetime {
     }
 
     template <>
-    struct WatchFaceTraits<WatchFace::Terminal> {
-      static constexpr WatchFace watchFace = WatchFace::Terminal;
+    struct WatchFaceTraits<Screens::WatchFaceTerminal> {
       static constexpr const char* name = "Terminal";
 
       static Screens::Screen* Create(AppControllers& controllers) {