4 files changed, 9 insertions, 4 deletions
diff --git a/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp
index ad338e78..e359199f 100644
--- a/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp
@@ -1,8 +1,9 @@
 #include "MeasureLengthPropertyEditor.h"
-#include "cru/base/Format.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/render/MeasureRequirement.h"
 
+#include <string>
+
 namespace cru::theme_builder::components::properties {
 MeasureLengthPropertyEditor::MeasureLengthPropertyEditor() {
   container_.AddChild(&label_);
@@ -32,6 +33,7 @@ void MeasureLengthPropertyEditor::SetValue(
   if (!trigger_change) SuppressNextChangeEvent();
   text_.SetText(measure_length_.IsNotSpecified()
                     ? u"unspecified"
-                    : ToString(measure_length_.GetLengthOrUndefined()));
+                    : String::FromUtf8(std::to_string(
+                          measure_length_.GetLengthOrUndefined())));
 }
 }  // namespace cru::theme_builder::components::properties
diff --git a/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp
index d8487209..f2d10cf7 100644
--- a/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp
@@ -1,8 +1,9 @@
 #include "PointPropertyEditor.h"
-#include "cru/base/Format.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/PointMapper.h"
 
+#include <format>
+
 namespace cru::theme_builder::components::properties {
 PointPropertyEditor::PointPropertyEditor() {
   container_.AddChild(&label_);
@@ -33,6 +34,6 @@ void PointPropertyEditor::SetValue(const ui::Point& point,
 }
 
 String PointPropertyEditor::ConvertPointToString(const ui::Point& point) {
-  return Format(u"{} {}", point.x, point.y);
+  return String::FromUtf8(std::format("{} {}", point.x, point.y));
 }
 }  // namespace cru::theme_builder::components::properties
diff --git a/src/ThemeBuilder/components/properties/ThicknessPropertyEditor.cpp b/src/ThemeBuilder/components/properties/ThicknessPropertyEditor.cpp
index 3e022bb1..955a44f7 100644
--- a/src/ThemeBuilder/components/properties/ThicknessPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/ThicknessPropertyEditor.cpp
@@ -1,4 +1,5 @@
 #include "ThicknessPropertyEditor.h"
+#include "cru/base/Format.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/ThicknessMapper.h"
 
diff --git a/src/ThemeBuilder/components/stylers/StylerEditor.cpp b/src/ThemeBuilder/components/stylers/StylerEditor.cpp
index 0348adbd..b3147a15 100644
--- a/src/ThemeBuilder/components/stylers/StylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/StylerEditor.cpp
@@ -8,6 +8,7 @@
 #include "MarginStylerEditor.h"
 #include "PaddingStylerEditor.h"
 #include "PreferredSizeStylerEditor.h"
+#include "cru/base/Exception.h"
 #include "cru/ui/controls/FlexLayout.h"
 #include "cru/ui/render/FlexLayoutRenderObject.h"
 #include "cru/ui/style/Styler.h"