3 files changed, 9 insertions, 11 deletions
diff --git a/include/cru/ui/style/ApplyBorderStyleInfo.hpp b/include/cru/ui/style/ApplyBorderStyleInfo.hpp
index 5058b51f..3923ebb4 100644
--- a/include/cru/ui/style/ApplyBorderStyleInfo.hpp
+++ b/include/cru/ui/style/ApplyBorderStyleInfo.hpp
@@ -1,7 +1,8 @@
 #pragma once
-#include <optional>
 #include "../Base.hpp"
 
+#include <optional>
+
 namespace cru::ui::style {
 struct ApplyBorderStyleInfo {
   explicit ApplyBorderStyleInfo(
diff --git a/include/cru/ui/style/StyleRule.hpp b/include/cru/ui/style/StyleRule.hpp
index 8ac42cd0..e6035784 100644
--- a/include/cru/ui/style/StyleRule.hpp
+++ b/include/cru/ui/style/StyleRule.hpp
@@ -1,19 +1,17 @@
 #pragma once
+#include "../Base.hpp"
 #include "Condition.hpp"
 #include "Styler.hpp"
-#include "cru/common/Base.hpp"
 #include "cru/common/ClonablePtr.hpp"
-#include "cru/ui/Base.hpp"
 
 #include <memory>
-#include <string>
 #include <vector>
 
 namespace cru::ui::style {
 class StyleRule : public Object {
  public:
   StyleRule(ClonablePtr<Condition> condition, ClonablePtr<Styler> styler,
-            std::u16string name = {});
+            String name = {});
 
   CRU_DEFAULT_COPY(StyleRule)
   CRU_DEFAULT_MOVE(StyleRule)
@@ -21,17 +19,16 @@ class StyleRule : public Object {
   ~StyleRule() override = default;
 
  public:
-  const std::u16string& GetName() const { return name_; }
+  String GetName() const { return name_; }
   Condition* GetCondition() const { return condition_.get(); }
   Styler* GetStyler() const { return styler_.get(); }
 
   StyleRule WithNewCondition(ClonablePtr<Condition> condition,
-                             std::u16string name = {}) const {
+                             String name = {}) const {
     return StyleRule{std::move(condition), styler_, std::move(name)};
   }
 
-  StyleRule WithNewStyler(ClonablePtr<Styler> styler,
-                          std::u16string name = {}) const {
+  StyleRule WithNewStyler(ClonablePtr<Styler> styler, String name = {}) const {
     return StyleRule{condition_, std::move(styler), std::move(name)};
   }
 
@@ -40,6 +37,6 @@ class StyleRule : public Object {
  private:
   ClonablePtr<Condition> condition_;
   ClonablePtr<Styler> styler_;
-  std::u16string name_;
+  String name_;
 };
 }  // namespace cru::ui::style
diff --git a/src/ui/style/StyleRule.cpp b/src/ui/style/StyleRule.cpp
index 1a72a970..59096fb6 100644
--- a/src/ui/style/StyleRule.cpp
+++ b/src/ui/style/StyleRule.cpp
@@ -2,7 +2,7 @@
 
 namespace cru::ui::style {
 StyleRule::StyleRule(ClonablePtr<Condition> condition,
-                     ClonablePtr<Styler> styler, std::u16string name)
+                     ClonablePtr<Styler> styler, String name)
     : condition_(std::move(condition)),
       styler_(std::move(styler)),
       name_(std::move(name)) {}