Rename ClonePtr, update theme.

47 files changed, 114 insertions, 114 deletions

diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp
index 04f2ed29..e207c761 100644
--- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp
@@ -1,5 +1,5 @@
 #include "CheckedConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
@@ -14,7 +14,7 @@ CheckedConditionEditor::CheckedConditionEditor() {
 
 CheckedConditionEditor::~CheckedConditionEditor() {}
 
-ClonablePtr<ui::style::CheckedCondition> CheckedConditionEditor::GetValue()
+ClonePtr<ui::style::CheckedCondition> CheckedConditionEditor::GetValue()
     const {
   return ui::style::CheckedCondition::Create(checked_check_box_.GetValue());
 }
diff --git a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h
index b6e740f1..c83a1cff 100644
--- a/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/CheckBoxPropertyEditor.h"
 #include "ConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
@@ -11,14 +11,14 @@ class CheckedConditionEditor : public ConditionEditor {
   ~CheckedConditionEditor() override;
 
  public:
-  ClonablePtr<ui::style::CheckedCondition> GetValue() const;
+  ClonePtr<ui::style::CheckedCondition> GetValue() const;
   void SetValue(ui::style::CheckedCondition* value, bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::CheckedCondition>& value,
+  void SetValue(const ClonePtr<ui::style::CheckedCondition>& value,
                 bool trigger_change = true) {
     SetValue(value.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Condition> GetCondition() override {
+  ClonePtr<ui::style::Condition> GetCondition() override {
     return GetValue();
   }
 
diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp
index 57652ef6..24e83a0e 100644
--- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp
@@ -1,5 +1,5 @@
 #include "ClickStateConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/helper/ClickDetector.h"
 #include "cru/ui/style/Condition.h"
 
@@ -55,7 +55,7 @@ ClickStateConditionEditor::ClickStateConditionEditor() {
 
 ClickStateConditionEditor::~ClickStateConditionEditor() {}
 
-ClonablePtr<ui::style::ClickStateCondition>
+ClonePtr<ui::style::ClickStateCondition>
 ClickStateConditionEditor::GetValue() const {
   return ui::style::ClickStateCondition::Create(
       ConvertIndexToClickState(click_state_select_.GetSelectedIndex()));
diff --git a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h
index 2ea4fcf4..24d60f7b 100644
--- a/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/SelectPropertyEditor.h"
 #include "ConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/Event.h"
 #include "cru/ui/style/Condition.h"
 
@@ -12,15 +12,15 @@ class ClickStateConditionEditor : public ConditionEditor {
   ~ClickStateConditionEditor();
 
  public:
-  ClonablePtr<ui::style::ClickStateCondition> GetValue() const;
+  ClonePtr<ui::style::ClickStateCondition> GetValue() const;
   void SetValue(ui::style::ClickStateCondition* value,
                 bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::ClickStateCondition>& value,
+  void SetValue(const ClonePtr<ui::style::ClickStateCondition>& value,
                 bool trigger_change = true) {
     SetValue(value.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Condition> GetCondition() override {
+  ClonePtr<ui::style::Condition> GetCondition() override {
     return GetValue();
   }
 
diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp
index a641c2df..d01ceca0 100644
--- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp
@@ -4,7 +4,7 @@
 #include "ConditionEditor.h"
 #include "FocusConditionEditor.h"
 #include "NoConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/platform/Color.h"
 #include "cru/ui/Base.h"
 #include "cru/ui/ThemeManager.h"
@@ -76,9 +76,9 @@ CompoundConditionEditor::CompoundConditionEditor() {
 
 CompoundConditionEditor::~CompoundConditionEditor() {}
 
-std::vector<ClonablePtr<ui::style::Condition>>
+std::vector<ClonePtr<ui::style::Condition>>
 CompoundConditionEditor::GetChildren() {
-  std::vector<ClonablePtr<ui::style::Condition>> children;
+  std::vector<ClonePtr<ui::style::Condition>> children;
   for (auto& child : children_) {
     children.push_back(child->GetCondition());
   }
@@ -86,7 +86,7 @@ CompoundConditionEditor::GetChildren() {
 }
 
 void CompoundConditionEditor::SetChildren(
-    std::vector<ClonablePtr<ui::style::Condition>> children,
+    std::vector<ClonePtr<ui::style::Condition>> children,
     bool trigger_change) {
   children_container_.ClearChildren();
   children_.clear();
diff --git a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h
index 2948df36..af632758 100644
--- a/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "ConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/Event.h"
 #include "cru/ui/components/Component.h"
 #include "cru/ui/components/PopupButton.h"
@@ -16,8 +16,8 @@ class CompoundConditionEditor : public ConditionEditor {
   ~CompoundConditionEditor();
 
  protected:
-  std::vector<ClonablePtr<ui::style::Condition>> GetChildren();
-  void SetChildren(std::vector<ClonablePtr<ui::style::Condition>> children,
+  std::vector<ClonePtr<ui::style::Condition>> GetChildren();
+  void SetChildren(std::vector<ClonePtr<ui::style::Condition>> children,
                    bool trigger_change = true);
 
  private:
@@ -32,18 +32,18 @@ class AndConditionEditor : public CompoundConditionEditor {
   ~AndConditionEditor() override = default;
 
  public:
-  ClonablePtr<ui::style::AndCondition> GetValue() {
+  ClonePtr<ui::style::AndCondition> GetValue() {
     return ui::style::AndCondition::Create(GetChildren());
   }
   void SetValue(ui::style::AndCondition* value, bool trigger_change = true) {
     SetChildren(value->GetChildren(), trigger_change);
   }
-  void SetValue(const ClonablePtr<ui::style::AndCondition>& value,
+  void SetValue(const ClonePtr<ui::style::AndCondition>& value,
                 bool trigger_change = true) {
     SetValue(value.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Condition> GetCondition() override {
+  ClonePtr<ui::style::Condition> GetCondition() override {
     return GetValue();
   }
 };
@@ -54,18 +54,18 @@ class OrConditionEditor : public CompoundConditionEditor {
   ~OrConditionEditor() override = default;
 
  public:
-  ClonablePtr<ui::style::OrCondition> GetValue() {
+  ClonePtr<ui::style::OrCondition> GetValue() {
     return ui::style::OrCondition::Create(GetChildren());
   }
   void SetValue(ui::style::OrCondition* value, bool trigger_change = true) {
     SetChildren(value->GetChildren(), trigger_change);
   }
-  void SetValue(const ClonablePtr<ui::style::OrCondition>& value,
+  void SetValue(const ClonePtr<ui::style::OrCondition>& value,
                 bool trigger_change = true) {
     SetValue(value.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Condition> GetCondition() override {
+  ClonePtr<ui::style::Condition> GetCondition() override {
     return GetValue();
   }
 };
diff --git a/src/ThemeBuilder/components/conditions/ConditionEditor.h b/src/ThemeBuilder/components/conditions/ConditionEditor.h
index f20132f6..ca632cc0 100644
--- a/src/ThemeBuilder/components/conditions/ConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/ConditionEditor.h
@@ -9,7 +9,7 @@ class ConditionEditor : public HeadBodyEditor {
   ~ConditionEditor() override;
 
  public:
-  virtual ClonablePtr<ui::style::Condition> GetCondition() = 0;
+  virtual ClonePtr<ui::style::Condition> GetCondition() = 0;
 };
 
 std::unique_ptr<ConditionEditor> CreateConditionEditor(
diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp
index 0ac3e224..67a660d1 100644
--- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp
@@ -1,5 +1,5 @@
 #include "FocusConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
@@ -14,7 +14,7 @@ FocusConditionEditor::FocusConditionEditor() {
 
 FocusConditionEditor::~FocusConditionEditor() {}
 
-ClonablePtr<ui::style::FocusCondition> FocusConditionEditor::GetValue() const {
+ClonePtr<ui::style::FocusCondition> FocusConditionEditor::GetValue() const {
   return ui::style::FocusCondition::Create(focus_check_box_.GetValue());
 }
 
diff --git a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h
index d5478653..c9c8018e 100644
--- a/src/ThemeBuilder/components/conditions/FocusConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/CheckBoxPropertyEditor.h"
 #include "ConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
@@ -11,14 +11,14 @@ class FocusConditionEditor : public ConditionEditor {
   ~FocusConditionEditor() override;
 
  public:
-  ClonablePtr<ui::style::FocusCondition> GetValue() const;
+  ClonePtr<ui::style::FocusCondition> GetValue() const;
   void SetValue(ui::style::FocusCondition* value, bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::FocusCondition>& value,
+  void SetValue(const ClonePtr<ui::style::FocusCondition>& value,
                 bool trigger_change = true) {
     SetValue(value.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Condition> GetCondition() override {
+  ClonePtr<ui::style::Condition> GetCondition() override {
     return GetValue();
   }
 
diff --git a/src/ThemeBuilder/components/conditions/NoConditionEditor.h b/src/ThemeBuilder/components/conditions/NoConditionEditor.h
index b38806b5..1cb50947 100644
--- a/src/ThemeBuilder/components/conditions/NoConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/NoConditionEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "ConditionEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Condition.h"
 
 namespace cru::theme_builder::components::conditions {
@@ -10,7 +10,7 @@ class NoConditionEditor : public ConditionEditor {
   ~NoConditionEditor() override;
 
  public:
-  ClonablePtr<ui::style::Condition> GetCondition() override {
+  ClonePtr<ui::style::Condition> GetCondition() override {
     return ui::style::NoCondition::Create();
   }
 };
diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp
index c44b4723..74ce83ec 100644
--- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp
@@ -1,5 +1,5 @@
 #include "BorderStylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/gui/UiApplication.h"
@@ -29,7 +29,7 @@ BorderStylerEditor::BorderStylerEditor() {
 
 BorderStylerEditor::~BorderStylerEditor() {}
 
-ClonablePtr<ui::style::BorderStyler> BorderStylerEditor::GetValue() {
+ClonePtr<ui::style::BorderStyler> BorderStylerEditor::GetValue() {
   auto graphics_factory =
       platform::gui::IUiApplication::GetInstance()->GetGraphicsFactory();
 
diff --git a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h
index c9435ee9..ea92a8d4 100644
--- a/src/ThemeBuilder/components/stylers/BorderStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h
@@ -4,7 +4,7 @@
 #include "../properties/OptionalPropertyEditor.h"
 #include "../properties/ThicknessPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 
 namespace cru::theme_builder::components::stylers {
 class BorderStylerEditor : public StylerEditor {
@@ -12,14 +12,14 @@ class BorderStylerEditor : public StylerEditor {
   BorderStylerEditor();
   ~BorderStylerEditor() override;
 
-  ClonablePtr<ui::style::BorderStyler> GetValue();
+  ClonePtr<ui::style::BorderStyler> GetValue();
   void SetValue(ui::style::BorderStyler* styler, bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::BorderStyler>& styler,
+  void SetValue(const ClonePtr<ui::style::BorderStyler>& styler,
                 bool trigger_change = true) {
     SetValue(styler.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+  ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
 
  private:
   properties::OptionalPropertyEditor<properties::CornerRadiusPropertyEditor>
diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp
index af22217b..15f4e912 100644
--- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp
@@ -6,7 +6,7 @@
 #include "MarginStylerEditor.h"
 #include "PaddingStylerEditor.h"
 #include "PreferredSizeStylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/ThemeManager.h"
 #include "cru/ui/style/Styler.h"
 
@@ -78,8 +78,8 @@ CompoundStylerEditor::CompoundStylerEditor() {
 
 CompoundStylerEditor::~CompoundStylerEditor() {}
 
-ClonablePtr<ui::style::CompoundStyler> CompoundStylerEditor::GetValue() {
-  std::vector<ClonablePtr<ui::style::Styler>> children_styler;
+ClonePtr<ui::style::CompoundStyler> CompoundStylerEditor::GetValue() {
+  std::vector<ClonePtr<ui::style::Styler>> children_styler;
   for (auto& child : children_) {
     children_styler.push_back(child->GetStyler());
   }
diff --git a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h
index 91d2bff5..f9265fbf 100644
--- a/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "StylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/DeleteLater.h"
 #include "cru/ui/components/PopupButton.h"
 #include "cru/ui/controls/FlexLayout.h"
@@ -13,14 +13,14 @@ class CompoundStylerEditor : public StylerEditor {
   ~CompoundStylerEditor() override;
 
  public:
-  ClonablePtr<ui::style::CompoundStyler> GetValue();
+  ClonePtr<ui::style::CompoundStyler> GetValue();
   void SetValue(ui::style::CompoundStyler* styler, bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::CompoundStyler>& styler,
+  void SetValue(const ClonePtr<ui::style::CompoundStyler>& styler,
                 bool trigger_change = true) {
     SetValue(styler.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+  ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
 
  private:
   ui::controls::FlexLayout children_container_;
diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp
index bd649c67..00b40d10 100644
--- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp
@@ -12,7 +12,7 @@ ContentBrushStylerEditor::ContentBrushStylerEditor() {
 
 ContentBrushStylerEditor::~ContentBrushStylerEditor() {}
 
-ClonablePtr<ui::style::ContentBrushStyler> ContentBrushStylerEditor::GetValue()
+ClonePtr<ui::style::ContentBrushStyler> ContentBrushStylerEditor::GetValue()
     const {
   return ui::style::ContentBrushStyler::Create(
       platform::gui::IUiApplication::GetInstance()
diff --git a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h
index ec51c041..91e8adc2 100644
--- a/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h
@@ -2,7 +2,7 @@
 #include "../Editor.h"
 #include "../properties/ColorPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
@@ -12,11 +12,11 @@ class ContentBrushStylerEditor : public StylerEditor {
   ~ContentBrushStylerEditor();
 
  public:
-  ClonablePtr<ui::style::ContentBrushStyler> GetValue() const;
+  ClonePtr<ui::style::ContentBrushStyler> GetValue() const;
   void SetValue(ui::style::ContentBrushStyler* value,
                 bool trigger_change = true);
 
-  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+  ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
 
  private:
   properties::ColorPropertyEditor color_editor_;
diff --git a/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp
index 71de739a..589efc2b 100644
--- a/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp
@@ -16,7 +16,7 @@ CursorStylerEditor::CursorStylerEditor() {
 
 CursorStylerEditor::~CursorStylerEditor() {}
 
-ClonablePtr<ui::style::CursorStyler> CursorStylerEditor::GetValue() {
+ClonePtr<ui::style::CursorStyler> CursorStylerEditor::GetValue() {
   auto cursor_manager =
       platform::gui::IUiApplication::GetInstance()->GetCursorManager();
 
diff --git a/src/ThemeBuilder/components/stylers/CursorStylerEditor.h b/src/ThemeBuilder/components/stylers/CursorStylerEditor.h
index 552619a0..a40c8aa9 100644
--- a/src/ThemeBuilder/components/stylers/CursorStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/CursorStylerEditor.h
@@ -9,14 +9,14 @@ class CursorStylerEditor : public StylerEditor {
   ~CursorStylerEditor() override;
 
  public:
-  ClonablePtr<ui::style::CursorStyler> GetValue();
+  ClonePtr<ui::style::CursorStyler> GetValue();
   void SetValue(ui::style::CursorStyler* styler, bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::CursorStyler>& styler,
+  void SetValue(const ClonePtr<ui::style::CursorStyler>& styler,
                 bool trigger_change = true) {
     SetValue(styler.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+  ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
 
  private:
   properties::SelectPropertyEditor cursor_select_;
diff --git a/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp b/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp
index 9787a4fd..c8687e6d 100644
--- a/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp
@@ -12,7 +12,7 @@ FontStylerEditor::FontStylerEditor() {
 
 FontStylerEditor::~FontStylerEditor() {}
 
-ClonablePtr<ui::style::FontStyler> FontStylerEditor::GetValue() const {
+ClonePtr<ui::style::FontStyler> FontStylerEditor::GetValue() const {
   return ui::style::FontStyler::Create(font_editor_.GetValue());
 }
 
diff --git a/src/ThemeBuilder/components/stylers/FontStylerEditor.h b/src/ThemeBuilder/components/stylers/FontStylerEditor.h
index 847b0e2a..a5145e31 100644
--- a/src/ThemeBuilder/components/stylers/FontStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.h
@@ -2,7 +2,7 @@
 #include "../Editor.h"
 #include "../properties/FontPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
@@ -12,10 +12,10 @@ class FontStylerEditor : public StylerEditor {
   ~FontStylerEditor();
 
  public:
-  ClonablePtr<ui::style::FontStyler> GetValue() const;
+  ClonePtr<ui::style::FontStyler> GetValue() const;
   void SetValue(ui::style::FontStyler* value, bool trigger_change = true);
 
-  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+  ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
 
  private:
   properties::FontPropertyEditor font_editor_;
diff --git a/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp b/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp
index c750e9b6..bfd15903 100644
--- a/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp
@@ -13,7 +13,7 @@ MarginStylerEditor::MarginStylerEditor() {
 
 MarginStylerEditor::~MarginStylerEditor() {}
 
-ClonablePtr<ui::style::MarginStyler> MarginStylerEditor::GetValue() {
+ClonePtr<ui::style::MarginStyler> MarginStylerEditor::GetValue() {
   return ui::style::MarginStyler::Create(thickness_editor_.GetValue());
 }
 
diff --git a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h
index 9a1ca750..e27bf61e 100644
--- a/src/ThemeBuilder/components/stylers/MarginStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/ThicknessPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
@@ -10,14 +10,14 @@ class MarginStylerEditor : public StylerEditor {
   MarginStylerEditor();
   ~MarginStylerEditor() override;
 
-  ClonablePtr<ui::style::MarginStyler> GetValue();
+  ClonePtr<ui::style::MarginStyler> GetValue();
   void SetValue(ui::style::MarginStyler* styler, bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::MarginStyler>& styler,
+  void SetValue(const ClonePtr<ui::style::MarginStyler>& styler,
                 bool trigger_change = true) {
     SetValue(styler.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+  ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
 
  private:
   properties::ThicknessPropertyEditor thickness_editor_;
diff --git a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp
index 5cf9d3d8..1ad6cf35 100644
--- a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp
@@ -13,7 +13,7 @@ PaddingStylerEditor::PaddingStylerEditor() {
 
 PaddingStylerEditor::~PaddingStylerEditor() {}
 
-ClonablePtr<ui::style::PaddingStyler> PaddingStylerEditor::GetValue() {
+ClonePtr<ui::style::PaddingStyler> PaddingStylerEditor::GetValue() {
   return ui::style::PaddingStyler::Create(thickness_editor_.GetValue());
 }
 
diff --git a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h
index 69565cad..e11918f8 100644
--- a/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/ThicknessPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
@@ -10,14 +10,14 @@ class PaddingStylerEditor : public StylerEditor {
   PaddingStylerEditor();
   ~PaddingStylerEditor() override;
 
-  ClonablePtr<ui::style::PaddingStyler> GetValue();
+  ClonePtr<ui::style::PaddingStyler> GetValue();
   void SetValue(ui::style::PaddingStyler* styler, bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::PaddingStyler>& styler,
+  void SetValue(const ClonePtr<ui::style::PaddingStyler>& styler,
                 bool trigger_change = true) {
     SetValue(styler.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+  ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
 
  private:
   properties::ThicknessPropertyEditor thickness_editor_;
diff --git a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp
index f0e700a1..8c7c751f 100644
--- a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp
@@ -16,7 +16,7 @@ PreferredSizeStylerEditor::PreferredSizeStylerEditor() {
 
 PreferredSizeStylerEditor::~PreferredSizeStylerEditor() {}
 
-ClonablePtr<ui::style::PreferredSizeStyler>
+ClonePtr<ui::style::PreferredSizeStyler>
 PreferredSizeStylerEditor::GetValue() {
   return ui::style::PreferredSizeStyler::Create(ui::render::MeasureSize{
       width_editor_.GetValue(), height_editor_.GetValue()});
diff --git a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h
index 36fdc3d6..2c83b533 100644
--- a/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "../properties/MeasureLengthPropertyEditor.h"
 #include "StylerEditor.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/style/Styler.h"
 
 namespace cru::theme_builder::components::stylers {
@@ -10,15 +10,15 @@ class PreferredSizeStylerEditor : public StylerEditor {
   PreferredSizeStylerEditor();
   ~PreferredSizeStylerEditor() override;
 
-  ClonablePtr<ui::style::PreferredSizeStyler> GetValue();
+  ClonePtr<ui::style::PreferredSizeStyler> GetValue();
   void SetValue(ui::style::PreferredSizeStyler* styler,
                 bool trigger_change = true);
-  void SetValue(const ClonablePtr<ui::style::PreferredSizeStyler>& styler,
+  void SetValue(const ClonePtr<ui::style::PreferredSizeStyler>& styler,
                 bool trigger_change = true) {
     SetValue(styler.get(), trigger_change);
   }
 
-  ClonablePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
+  ClonePtr<ui::style::Styler> GetStyler() override { return GetValue(); }
 
  private:
   properties::MeasureLengthPropertyEditor width_editor_;
diff --git a/src/ThemeBuilder/components/stylers/StylerEditor.h b/src/ThemeBuilder/components/stylers/StylerEditor.h
index 8aa52bda..8bd6af48 100644
--- a/src/ThemeBuilder/components/stylers/StylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/StylerEditor.h
@@ -9,7 +9,7 @@ class StylerEditor : public HeadBodyEditor {
   ~StylerEditor() override;
 
  public:
-  virtual ClonablePtr<ui::style::Styler> GetStyler() = 0;
+  virtual ClonePtr<ui::style::Styler> GetStyler() = 0;
 };
 
 std::unique_ptr<StylerEditor> CreateStylerEditor(ui::style::Styler* styler);
diff --git a/src/ui/mapper/FontMapper.cpp b/src/ui/mapper/FontMapper.cpp
index ebf7c27c..6ba37964 100644
--- a/src/ui/mapper/FontMapper.cpp
+++ b/src/ui/mapper/FontMapper.cpp
@@ -16,7 +16,7 @@ std::shared_ptr<platform::graphics::IFont> FontMapper::DoMapFromXml(
   auto font_family = font_family_attr.value_or("");
   auto font_size =
       font_size_attr ? cru::string::ParseToNumber<float>(*font_size_attr).value
-                     : 24.0f;
+                     : 16.0f;
 
   return GetGraphicsFactory()->CreateFont(font_family, font_size);
 }
diff --git a/src/ui/mapper/style/AndConditionMapper.cpp b/src/ui/mapper/style/AndConditionMapper.cpp
index 0b1fc008..ad996a4e 100644
--- a/src/ui/mapper/style/AndConditionMapper.cpp
+++ b/src/ui/mapper/style/AndConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/AndConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/style/IConditionMapper.h"
 #include "cru/ui/style/Condition.h"
@@ -10,9 +10,9 @@ bool AndConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
   return cru::string::CaseInsensitiveCompare(node->GetTag(), "AndCondition") == 0;
 }
 
-ClonablePtr<ui::style::AndCondition> AndConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::AndCondition> AndConditionMapper::DoMapFromXml(
     xml::XmlElementNode *node) {
-  std::vector<ClonablePtr<ui::style::Condition>> conditions;
+  std::vector<ClonePtr<ui::style::Condition>> conditions;
   auto condition_mappers =
       MapperRegistry::GetInstance()->GetMappersByInterface<IConditionMapper>();
   for (auto child : node->GetChildren()) {
diff --git a/src/ui/mapper/style/BorderStylerMapper.cpp b/src/ui/mapper/style/BorderStylerMapper.cpp
index 3deeed43..33358b28 100644
--- a/src/ui/mapper/style/BorderStylerMapper.cpp
+++ b/src/ui/mapper/style/BorderStylerMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/BorderStylerMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/ApplyBorderStyleInfo.h"
 #include "cru/ui/style/Styler.h"
@@ -13,7 +13,7 @@ bool BorderStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
   return cru::string::CaseInsensitiveCompare(node->GetTag(), "BorderStyler") == 0;
 }
 
-ClonablePtr<BorderStyler> BorderStylerMapper::DoMapFromXml(
+ClonePtr<BorderStyler> BorderStylerMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   auto border_style_mapper =
       MapperRegistry::GetInstance()->GetMapper<ApplyBorderStyleInfo>();
diff --git a/src/ui/mapper/style/CheckedConditionMapper.cpp b/src/ui/mapper/style/CheckedConditionMapper.cpp
index 2d01b4bf..9e93cbea 100644
--- a/src/ui/mapper/style/CheckedConditionMapper.cpp
+++ b/src/ui/mapper/style/CheckedConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/CheckedConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/StringUtil.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/base/xml/XmlNode.h"
@@ -10,7 +10,7 @@ bool CheckedConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
                                              "CheckedCondition") == 0;
 }
 
-ClonablePtr<ui::style::CheckedCondition> CheckedConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::CheckedCondition> CheckedConditionMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   auto value = node->GetAttributeValueCaseInsensitive("value");
   if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
diff --git a/src/ui/mapper/style/ClickStateConditionMapper.cpp b/src/ui/mapper/style/ClickStateConditionMapper.cpp
index 16ef1209..accfdf0a 100644
--- a/src/ui/mapper/style/ClickStateConditionMapper.cpp
+++ b/src/ui/mapper/style/ClickStateConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/ClickStateConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/StringUtil.h"
 #include "cru/ui/helper/ClickDetector.h"
 #include "cru/ui/style/Condition.h"
@@ -11,7 +11,7 @@ bool ClickStateConditionMapper::XmlElementIsOfThisType(
                                              "ClickStateCondition") == 0;
 }
 
-ClonablePtr<ui::style::ClickStateCondition>
+ClonePtr<ui::style::ClickStateCondition>
 ClickStateConditionMapper::DoMapFromXml(xml::XmlElementNode *node) {
   auto state = helper::ClickState::None;
   auto value_attr = node->GetOptionalAttributeValueCaseInsensitive("value");
diff --git a/src/ui/mapper/style/ContentBrushStylerMapper.cpp b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
index c5caab02..1ab91be0 100644
--- a/src/ui/mapper/style/ContentBrushStylerMapper.cpp
+++ b/src/ui/mapper/style/ContentBrushStylerMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/ContentBrushStylerMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/platform/graphics/Brush.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/Styler.h"
@@ -12,7 +12,7 @@ ContentBrushStylerMapper::ContentBrushStylerMapper() {
 
 ContentBrushStylerMapper::~ContentBrushStylerMapper() {}
 
-ClonablePtr<ui::style::ContentBrushStyler>
+ClonePtr<ui::style::ContentBrushStyler>
 ContentBrushStylerMapper::DoMapFromXml(xml::XmlElementNode* node) {
   auto brush_mapper = MapperRegistry::GetInstance()
                           ->GetSharedPtrMapper<platform::graphics::IBrush>();
diff --git a/src/ui/mapper/style/CursorStylerMapper.cpp b/src/ui/mapper/style/CursorStylerMapper.cpp
index c9a75329..e5051ce0 100644
--- a/src/ui/mapper/style/CursorStylerMapper.cpp
+++ b/src/ui/mapper/style/CursorStylerMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/CursorStylerMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/style/Styler.h"
@@ -9,7 +9,7 @@ bool CursorStylerMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
   return cru::string::CaseInsensitiveCompare(node->GetTag(), "CursorStyler") == 0;
 }
 
-ClonablePtr<ui::style::CursorStyler> CursorStylerMapper::DoMapFromXml(
+ClonePtr<ui::style::CursorStyler> CursorStylerMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   auto cursor_mapper =
       MapperRegistry::GetInstance()->GetSharedPtrMapper<platform::gui::ICursor>();
diff --git a/src/ui/mapper/style/FocusConditionMapper.cpp b/src/ui/mapper/style/FocusConditionMapper.cpp
index 26a5780d..08d0c992 100644
--- a/src/ui/mapper/style/FocusConditionMapper.cpp
+++ b/src/ui/mapper/style/FocusConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/FocusConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/StringUtil.h"
 #include "cru/ui/style/Condition.h"
 #include "cru/base/xml/XmlNode.h"
@@ -10,7 +10,7 @@ bool FocusConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
                                              "FocusCondition") == 0;
 }
 
-ClonablePtr<ui::style::FocusCondition> FocusConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::FocusCondition> FocusConditionMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   auto value = node->GetAttributeValueCaseInsensitive("value");
   if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
diff --git a/src/ui/mapper/style/FontStylerMapper.cpp b/src/ui/mapper/style/FontStylerMapper.cpp
index 1555c071..ac8051a3 100644
--- a/src/ui/mapper/style/FontStylerMapper.cpp
+++ b/src/ui/mapper/style/FontStylerMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/FontStylerMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 
 namespace cru::ui::mapper::style {
@@ -7,7 +7,7 @@ FontStylerMapper::FontStylerMapper() { SetAllowedTags({"FontStyler"}); }
 
 FontStylerMapper::~FontStylerMapper() {}
 
-ClonablePtr<ui::style::FontStyler> FontStylerMapper::DoMapFromXml(
+ClonePtr<ui::style::FontStyler> FontStylerMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   auto font_mapper = MapperRegistry::GetInstance()
                          ->GetSharedPtrMapper<platform::graphics::IFont>();
diff --git a/src/ui/mapper/style/HoverConditionMapper.cpp b/src/ui/mapper/style/HoverConditionMapper.cpp
index 1a7ffd95..7797ad7c 100644
--- a/src/ui/mapper/style/HoverConditionMapper.cpp
+++ b/src/ui/mapper/style/HoverConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/HoverConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/StringUtil.h"
 #include "cru/ui/style/Condition.h"
 
@@ -11,7 +11,7 @@ bool HoverConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
                                              "HoverCondition") == 0;
 }
 
-ClonablePtr<HoverCondition> HoverConditionMapper::DoMapFromXml(
+ClonePtr<HoverCondition> HoverConditionMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   auto value = node->GetAttributeValueCaseInsensitive("value");
   if (cru::string::CaseInsensitiveCompare(value, "true") == 0) {
diff --git a/src/ui/mapper/style/MarginStylerMapper.cpp b/src/ui/mapper/style/MarginStylerMapper.cpp
index ffbdcd75..2343dd3e 100644
--- a/src/ui/mapper/style/MarginStylerMapper.cpp
+++ b/src/ui/mapper/style/MarginStylerMapper.cpp
@@ -8,7 +8,7 @@ MarginStylerMapper::MarginStylerMapper() { SetAllowedTags({"MarginStyler"}); }
 
 MarginStylerMapper::~MarginStylerMapper() {}
 
-ClonablePtr<ui::style::MarginStyler> MarginStylerMapper::DoMapFromXml(
+ClonePtr<ui::style::MarginStyler> MarginStylerMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   Thickness thickness;
 
diff --git a/src/ui/mapper/style/NoConditionMapper.cpp b/src/ui/mapper/style/NoConditionMapper.cpp
index 84cbf598..3ee9981e 100644
--- a/src/ui/mapper/style/NoConditionMapper.cpp
+++ b/src/ui/mapper/style/NoConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/NoConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/xml/XmlNode.h"
 
 namespace cru::ui::mapper::style {
@@ -7,7 +7,7 @@ bool NoConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
   return cru::string::CaseInsensitiveCompare(node->GetTag(), "NoCondition") == 0;
 }
 
-ClonablePtr<ui::style::NoCondition> NoConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::NoCondition> NoConditionMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   return ui::style::NoCondition::Create();
 }
diff --git a/src/ui/mapper/style/OrConditionMapper.cpp b/src/ui/mapper/style/OrConditionMapper.cpp
index 98b4078d..5591bab0 100644
--- a/src/ui/mapper/style/OrConditionMapper.cpp
+++ b/src/ui/mapper/style/OrConditionMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/OrConditionMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/style/IConditionMapper.h"
 #include "cru/ui/style/Condition.h"
@@ -10,9 +10,9 @@ bool OrConditionMapper::XmlElementIsOfThisType(xml::XmlElementNode *node) {
   return cru::string::CaseInsensitiveCompare(node->GetTag(), "OrCondition") == 0;
 }
 
-ClonablePtr<ui::style::OrCondition> OrConditionMapper::DoMapFromXml(
+ClonePtr<ui::style::OrCondition> OrConditionMapper::DoMapFromXml(
     xml::XmlElementNode *node) {
-  std::vector<ClonablePtr<ui::style::Condition>> conditions;
+  std::vector<ClonePtr<ui::style::Condition>> conditions;
   auto condition_mappers =
       MapperRegistry::GetInstance()->GetMappersByInterface<IConditionMapper>();
   for (auto child : node->GetChildren()) {
diff --git a/src/ui/mapper/style/PaddingStylerMapper.cpp b/src/ui/mapper/style/PaddingStylerMapper.cpp
index faa86082..60c40c3d 100644
--- a/src/ui/mapper/style/PaddingStylerMapper.cpp
+++ b/src/ui/mapper/style/PaddingStylerMapper.cpp
@@ -10,7 +10,7 @@ PaddingStylerMapper::PaddingStylerMapper() {
 
 PaddingStylerMapper::~PaddingStylerMapper() {}
 
-ClonablePtr<ui::style::PaddingStyler> PaddingStylerMapper::DoMapFromXml(
+ClonePtr<ui::style::PaddingStyler> PaddingStylerMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   Thickness thickness;
 
diff --git a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
index 2fe71025..0603f5c4 100644
--- a/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
+++ b/src/ui/mapper/style/PreferredSizeStylerMapper.cpp
@@ -9,7 +9,7 @@ bool PreferredSizeStylerMapper::XmlElementIsOfThisType(
   return cru::string::CaseInsensitiveCompare(node->GetTag(), "PreferredSizeStyler") == 0;
 }
 
-ClonablePtr<ui::style::PreferredSizeStyler>
+ClonePtr<ui::style::PreferredSizeStyler>
 PreferredSizeStylerMapper::DoMapFromXml(xml::XmlElementNode* node) {
   render::MeasureSize size;
 
diff --git a/src/ui/mapper/style/StyleRuleMapper.cpp b/src/ui/mapper/style/StyleRuleMapper.cpp
index f14d11da..30fedb16 100644
--- a/src/ui/mapper/style/StyleRuleMapper.cpp
+++ b/src/ui/mapper/style/StyleRuleMapper.cpp
@@ -1,5 +1,5 @@
 #include "cru/ui/mapper/style/StyleRuleMapper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/ui/mapper/MapperRegistry.h"
 #include "cru/ui/mapper/style/IConditionMapper.h"
 #include "cru/ui/mapper/style/IStylerMapper.h"
@@ -13,15 +13,15 @@ bool StyleRuleMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
   return cru::string::CaseInsensitiveCompare(node->GetTag(), "StyleRule") == 0;
 }
 
-ClonablePtr<ui::style::StyleRule> StyleRuleMapper::DoMapFromXml(
+ClonePtr<ui::style::StyleRule> StyleRuleMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   std::vector<IConditionMapper*> condition_mappers =
       MapperRegistry::GetInstance()->GetMappersByInterface<IConditionMapper>();
   std::vector<IStylerMapper*> styler_mappers =
       MapperRegistry::GetInstance()->GetMappersByInterface<IStylerMapper>();
 
-  std::vector<ClonablePtr<Condition>> conditions;
-  std::vector<ClonablePtr<Styler>> stylers;
+  std::vector<ClonePtr<Condition>> conditions;
+  std::vector<ClonePtr<Styler>> stylers;
 
   for (auto child : node->GetChildren()) {
     if (child->GetType() == xml::XmlNode::Type::Element) {
diff --git a/src/ui/mapper/style/StyleRuleSetMapper.cpp b/src/ui/mapper/style/StyleRuleSetMapper.cpp
index d4bc7c37..19a628ad 100644
--- a/src/ui/mapper/style/StyleRuleSetMapper.cpp
+++ b/src/ui/mapper/style/StyleRuleSetMapper.cpp
@@ -14,7 +14,7 @@ bool StyleRuleSetMapper::XmlElementIsOfThisType(xml::XmlElementNode* node) {
 std::shared_ptr<ui::style::StyleRuleSet> StyleRuleSetMapper::DoMapFromXml(
     xml::XmlElementNode* node) {
   auto style_rule_mapper =
-      MapperRegistry::GetInstance()->GetClonablePtrMapper<StyleRule>();
+      MapperRegistry::GetInstance()->GetClonePtrMapper<StyleRule>();
 
   auto result = std::make_shared<StyleRuleSet>();
 
diff --git a/src/ui/style/Condition.cpp b/src/ui/style/Condition.cpp
index a0de03dc..abe52edb 100644
--- a/src/ui/style/Condition.cpp
+++ b/src/ui/style/Condition.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/style/Condition.h"
 #include <memory>
 
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/base/Event.h"
 #include "cru/ui/controls/Control.h"
 #include "cru/ui/controls/ICheckableControl.h"
@@ -10,7 +10,7 @@
 
 namespace cru::ui::style {
 CompoundCondition::CompoundCondition(
-    std::vector<ClonablePtr<Condition>> conditions)
+    std::vector<ClonePtr<Condition>> conditions)
     : conditions_(std::move(conditions)) {}
 
 std::vector<IBaseEvent*> CompoundCondition::ChangeOn(
diff --git a/src/ui/style/StyleRule.cpp b/src/ui/style/StyleRule.cpp
index 8b9b0a56..bdd0acf2 100644
--- a/src/ui/style/StyleRule.cpp
+++ b/src/ui/style/StyleRule.cpp
@@ -1,8 +1,8 @@
 #include "cru/ui/style/StyleRule.h"
 
 namespace cru::ui::style {
-StyleRule::StyleRule(ClonablePtr<Condition> condition,
-                     ClonablePtr<Styler> styler, std::string name)
+StyleRule::StyleRule(ClonePtr<Condition> condition,
+                     ClonePtr<Styler> styler, std::string name)
     : condition_(std::move(condition)),
       styler_(std::move(styler)),
       name_(std::move(name)) {}
diff --git a/src/ui/style/Styler.cpp b/src/ui/style/Styler.cpp
index a4e3ac25..8b4405cd 100644
--- a/src/ui/style/Styler.cpp
+++ b/src/ui/style/Styler.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/style/Styler.h"
 
 #include "../Helper.h"
-#include "cru/base/ClonablePtr.h"
+#include "cru/base/ClonePtr.h"
 #include "cru/platform/gui/Cursor.h"
 #include "cru/platform/gui/UiApplication.h"
 #include "cru/ui/controls/Control.h"
@@ -20,7 +20,7 @@ void BorderStyler::Apply(controls::Control *control) const {
   }
 }
 
-ClonablePtr<CursorStyler> CursorStyler::Create(
+ClonePtr<CursorStyler> CursorStyler::Create(
     platform::gui::SystemCursorType type) {
   return Create(GetUiApplication()->GetCursorManager()->GetSystemCursor(type));
 }