83 files changed, 32 insertions, 53 deletions

diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt
index 220fbeae..9b8f0fec 100644
--- a/demos/CMakeLists.txt
+++ b/demos/CMakeLists.txt
@@ -1,23 +1,23 @@
-add_library(cru_demo_base INTERFACE)
+add_library(CruDemoBase INTERFACE)
 
-target_link_libraries(cru_demo_base INTERFACE CruPlatformBootstrap)
+target_link_libraries(CruDemoBase INTERFACE CruPlatformBootstrap)
 
 if(WIN32)
 	add_subdirectory(graphics)
 
 	add_subdirectory(main)
-	add_subdirectory(scroll_view)
+	add_subdirectory(ScrollView)
 
-	add_subdirectory(input_method)
-	add_subdirectory(svg_path)
+	add_subdirectory(InputMethod)
+	add_subdirectory(SvgPath)
 elseif(APPLE)
 	add_subdirectory(graphics)
 
 	add_subdirectory(main)
-	add_subdirectory(scroll_view)
+	add_subdirectory(ScrollView)
 
-	add_subdirectory(input_method)
-	add_subdirectory(svg_path)
+	add_subdirectory(InputMethod)
+	add_subdirectory(SvgPath)
 elseif(UNIX)
 	add_subdirectory(xcb)
 endif()
diff --git a/demos/input_method/CMakeLists.txt b/demos/InputMethod/CMakeLists.txt
index 7c19c4dd..8ceeaec9 100644
--- a/demos/input_method/CMakeLists.txt
+++ b/demos/InputMethod/CMakeLists.txt
@@ -8,5 +8,5 @@ if(APPLE)
 	)
 endif()
 
-target_link_libraries(CruDemoInputMethod PRIVATE cru_demo_base)
+target_link_libraries(CruDemoInputMethod PRIVATE CruDemoBase)
 
diff --git a/demos/input_method/main.cpp b/demos/InputMethod/main.cpp
index abbbed2c..abbbed2c 100644
--- a/demos/input_method/main.cpp
+++ b/demos/InputMethod/main.cpp
diff --git a/demos/scroll_view/CMakeLists.txt b/demos/ScrollView/CMakeLists.txt
index 0b9196fe..8b34f5d8 100644
--- a/demos/scroll_view/CMakeLists.txt
+++ b/demos/ScrollView/CMakeLists.txt
@@ -9,4 +9,4 @@ if(APPLE)
 endif()
 
 target_add_resources(CruDemoScrollView cru/ui)
-target_link_libraries(CruDemoScrollView PRIVATE cru_demo_base CruUi)
+target_link_libraries(CruDemoScrollView PRIVATE CruDemoBase CruUi)
diff --git a/demos/scroll_view/main.cpp b/demos/ScrollView/main.cpp
index b049a408..b049a408 100644
--- a/demos/scroll_view/main.cpp
+++ b/demos/ScrollView/main.cpp
diff --git a/demos/svg_path/CMakeLists.txt b/demos/SvgPath/CMakeLists.txt
index 5488c6b0..34120111 100644
--- a/demos/svg_path/CMakeLists.txt
+++ b/demos/SvgPath/CMakeLists.txt
@@ -8,5 +8,5 @@ if(APPLE)
 	)
 endif()
 
-target_link_libraries(CruDemoSvgPath PRIVATE cru_demo_base)
+target_link_libraries(CruDemoSvgPath PRIVATE CruDemoBase)
 
diff --git a/demos/svg_path/main.cpp b/demos/SvgPath/main.cpp
index 87c410e9..87c410e9 100644
--- a/demos/svg_path/main.cpp
+++ b/demos/SvgPath/main.cpp
diff --git a/demos/graphics/CMakeLists.txt b/demos/graphics/CMakeLists.txt
index 3a249b1d..b290ba13 100644
--- a/demos/graphics/CMakeLists.txt
+++ b/demos/graphics/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_executable(CruDemoGraphicsDrawCircle DrawCircle.cpp)
 
-target_link_libraries(CruDemoGraphicsDrawCircle PRIVATE cru_demo_base)
+target_link_libraries(CruDemoGraphicsDrawCircle PRIVATE CruDemoBase)
diff --git a/demos/main/CMakeLists.txt b/demos/main/CMakeLists.txt
index 721ace19..2da90405 100644
--- a/demos/main/CMakeLists.txt
+++ b/demos/main/CMakeLists.txt
@@ -9,4 +9,4 @@ if(APPLE)
 endif()
 
 target_add_resources(CruDemoMain cru/ui)
-target_link_libraries(CruDemoMain PRIVATE cru_demo_base CruUi)
+target_link_libraries(CruDemoMain PRIVATE CruDemoBase CruUi)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b3fdbff2..9cb01e47 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,4 +7,4 @@ add_subdirectory(parse)
 add_subdirectory(toml)
 add_subdirectory(xml)
 
-add_subdirectory(theme_builder)
+add_subdirectory(ThemeBuilder)
diff --git a/src/theme_builder/CMakeLists.txt b/src/ThemeBuilder/CMakeLists.txt
index 656f9f0a..93b24e85 100644
--- a/src/theme_builder/CMakeLists.txt
+++ b/src/ThemeBuilder/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_executable(cru_theme_builder
+add_executable(CruThemeBuilder
 	main.cpp
 	components/Common.cpp
 	components/Editor.cpp
@@ -33,13 +33,13 @@ add_executable(cru_theme_builder
 )
 
 if(APPLE)
-	set_target_properties(cru_theme_builder PROPERTIES
+	set_target_properties(CruThemeBuilder PROPERTIES
 		MACOSX_BUNDLE TRUE
     	MACOSX_BUNDLE_BUNDLE_NAME cru-theme-builder
     	MACOSX_BUNDLE_GUI_IDENTIFIER life.crupest.cru.theme-builder
 	)
 endif()
 
-target_add_resources(cru_theme_builder cru/ui)
-target_add_resources(cru_theme_builder cru/theme_builder)
-target_link_libraries(cru_theme_builder PRIVATE CruPlatformBootstrap CruUi)
+target_add_resources(CruThemeBuilder cru/ui)
+target_add_resources(CruThemeBuilder cru/theme_builder)
+target_link_libraries(CruThemeBuilder PRIVATE CruPlatformBootstrap CruUi)
diff --git a/src/theme_builder/components/Common.cpp b/src/ThemeBuilder/components/Common.cpp
index 75d5deb0..75d5deb0 100644
--- a/src/theme_builder/components/Common.cpp
+++ b/src/ThemeBuilder/components/Common.cpp
diff --git a/src/theme_builder/components/Common.h b/src/ThemeBuilder/components/Common.h
index b91fcf88..b91fcf88 100644
--- a/src/theme_builder/components/Common.h
+++ b/src/ThemeBuilder/components/Common.h
diff --git a/src/theme_builder/components/Editor.cpp b/src/ThemeBuilder/components/Editor.cpp
index 89e27e83..89e27e83 100644
--- a/src/theme_builder/components/Editor.cpp
+++ b/src/ThemeBuilder/components/Editor.cpp
diff --git a/src/theme_builder/components/Editor.h b/src/ThemeBuilder/components/Editor.h
index 29809c82..29809c82 100644
--- a/src/theme_builder/components/Editor.h
+++ b/src/ThemeBuilder/components/Editor.h
diff --git a/src/theme_builder/components/HeadBodyEditor.cpp b/src/ThemeBuilder/components/HeadBodyEditor.cpp
index 6d7ace66..6d7ace66 100644
--- a/src/theme_builder/components/HeadBodyEditor.cpp
+++ b/src/ThemeBuilder/components/HeadBodyEditor.cpp
diff --git a/src/theme_builder/components/HeadBodyEditor.h b/src/ThemeBuilder/components/HeadBodyEditor.h
index 8119724f..8119724f 100644
--- a/src/theme_builder/components/HeadBodyEditor.h
+++ b/src/ThemeBuilder/components/HeadBodyEditor.h
diff --git a/src/theme_builder/components/MainWindow.cpp b/src/ThemeBuilder/components/MainWindow.cpp
index 0c78ef25..0c78ef25 100644
--- a/src/theme_builder/components/MainWindow.cpp
+++ b/src/ThemeBuilder/components/MainWindow.cpp
diff --git a/src/theme_builder/components/MainWindow.h b/src/ThemeBuilder/components/MainWindow.h
index ede1c38f..ede1c38f 100644
--- a/src/theme_builder/components/MainWindow.h
+++ b/src/ThemeBuilder/components/MainWindow.h
diff --git a/src/theme_builder/components/StyleRuleEditor.cpp b/src/ThemeBuilder/components/StyleRuleEditor.cpp
index dcb33184..dcb33184 100644
--- a/src/theme_builder/components/StyleRuleEditor.cpp
+++ b/src/ThemeBuilder/components/StyleRuleEditor.cpp
diff --git a/src/theme_builder/components/StyleRuleEditor.h b/src/ThemeBuilder/components/StyleRuleEditor.h
index 8e3db3de..8e3db3de 100644
--- a/src/theme_builder/components/StyleRuleEditor.h
+++ b/src/ThemeBuilder/components/StyleRuleEditor.h
diff --git a/src/theme_builder/components/StyleRuleSetEditor.cpp b/src/ThemeBuilder/components/StyleRuleSetEditor.cpp
index 8cf5af6d..8cf5af6d 100644
--- a/src/theme_builder/components/StyleRuleSetEditor.cpp
+++ b/src/ThemeBuilder/components/StyleRuleSetEditor.cpp
diff --git a/src/theme_builder/components/StyleRuleSetEditor.h b/src/ThemeBuilder/components/StyleRuleSetEditor.h
index 03148889..03148889 100644
--- a/src/theme_builder/components/StyleRuleSetEditor.h
+++ b/src/ThemeBuilder/components/StyleRuleSetEditor.h
diff --git a/src/theme_builder/components/conditions/CheckedConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp
index 64370981..64370981 100644
--- a/src/theme_builder/components/conditions/CheckedConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.cpp
diff --git a/src/theme_builder/components/conditions/CheckedConditionEditor.h b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h
index 7cf14912..7cf14912 100644
--- a/src/theme_builder/components/conditions/CheckedConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/CheckedConditionEditor.h
diff --git a/src/theme_builder/components/conditions/ClickStateConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp
index a8d5cc87..a8d5cc87 100644
--- a/src/theme_builder/components/conditions/ClickStateConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.cpp
diff --git a/src/theme_builder/components/conditions/ClickStateConditionEditor.h b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h
index 454a1346..454a1346 100644
--- a/src/theme_builder/components/conditions/ClickStateConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/ClickStateConditionEditor.h
diff --git a/src/theme_builder/components/conditions/CompoundConditionEditor.cpp b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp
index 69b8ed02..69b8ed02 100644
--- a/src/theme_builder/components/conditions/CompoundConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.cpp
diff --git a/src/theme_builder/components/conditions/CompoundConditionEditor.h b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h
index e1398514..e1398514 100644
--- a/src/theme_builder/components/conditions/CompoundConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/CompoundConditionEditor.h
diff --git a/src/theme_builder/components/conditions/ConditionEditor.cpp b/src/ThemeBuilder/components/conditions/ConditionEditor.cpp
index 5b79c639..5b79c639 100644
--- a/src/theme_builder/components/conditions/ConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/ConditionEditor.cpp
diff --git a/src/theme_builder/components/conditions/ConditionEditor.h b/src/ThemeBuilder/components/conditions/ConditionEditor.h
index f20132f6..f20132f6 100644
--- a/src/theme_builder/components/conditions/ConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/ConditionEditor.h
diff --git a/src/theme_builder/components/conditions/FocusConditionEditor.cpp b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp
index 1fb99d64..1fb99d64 100644
--- a/src/theme_builder/components/conditions/FocusConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.cpp
diff --git a/src/theme_builder/components/conditions/FocusConditionEditor.h b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h
index 1faf4d7d..1faf4d7d 100644
--- a/src/theme_builder/components/conditions/FocusConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/FocusConditionEditor.h
diff --git a/src/theme_builder/components/conditions/NoConditionEditor.cpp b/src/ThemeBuilder/components/conditions/NoConditionEditor.cpp
index a5087159..a5087159 100644
--- a/src/theme_builder/components/conditions/NoConditionEditor.cpp
+++ b/src/ThemeBuilder/components/conditions/NoConditionEditor.cpp
diff --git a/src/theme_builder/components/conditions/NoConditionEditor.h b/src/ThemeBuilder/components/conditions/NoConditionEditor.h
index 19616319..19616319 100644
--- a/src/theme_builder/components/conditions/NoConditionEditor.h
+++ b/src/ThemeBuilder/components/conditions/NoConditionEditor.h
diff --git a/src/theme_builder/components/properties/CheckBoxPropertyEditor.cpp b/src/ThemeBuilder/components/properties/CheckBoxPropertyEditor.cpp
index fb6f4705..fb6f4705 100644
--- a/src/theme_builder/components/properties/CheckBoxPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/CheckBoxPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/CheckBoxPropertyEditor.h b/src/ThemeBuilder/components/properties/CheckBoxPropertyEditor.h
index f78ed6c9..f78ed6c9 100644
--- a/src/theme_builder/components/properties/CheckBoxPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/CheckBoxPropertyEditor.h
diff --git a/src/theme_builder/components/properties/ColorPropertyEditor.cpp b/src/ThemeBuilder/components/properties/ColorPropertyEditor.cpp
index e9e486ac..e9e486ac 100644
--- a/src/theme_builder/components/properties/ColorPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/ColorPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/ColorPropertyEditor.h b/src/ThemeBuilder/components/properties/ColorPropertyEditor.h
index aa6cfcfa..aa6cfcfa 100644
--- a/src/theme_builder/components/properties/ColorPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/ColorPropertyEditor.h
diff --git a/src/theme_builder/components/properties/CornerRadiusPropertyEditor.cpp b/src/ThemeBuilder/components/properties/CornerRadiusPropertyEditor.cpp
index fc86b0ed..fc86b0ed 100644
--- a/src/theme_builder/components/properties/CornerRadiusPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/CornerRadiusPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/CornerRadiusPropertyEditor.h b/src/ThemeBuilder/components/properties/CornerRadiusPropertyEditor.h
index 6b6833d1..6b6833d1 100644
--- a/src/theme_builder/components/properties/CornerRadiusPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/CornerRadiusPropertyEditor.h
diff --git a/src/theme_builder/components/properties/FontPropertyEditor.cpp b/src/ThemeBuilder/components/properties/FontPropertyEditor.cpp
index 927ada7d..927ada7d 100644
--- a/src/theme_builder/components/properties/FontPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/FontPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/FontPropertyEditor.h b/src/ThemeBuilder/components/properties/FontPropertyEditor.h
index d349f1f2..d349f1f2 100644
--- a/src/theme_builder/components/properties/FontPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/FontPropertyEditor.h
diff --git a/src/theme_builder/components/properties/MeasureLengthPropertyEditor.cpp b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp
index d1f4afce..d1f4afce 100644
--- a/src/theme_builder/components/properties/MeasureLengthPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/MeasureLengthPropertyEditor.h b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.h
index 43e783c5..43e783c5 100644
--- a/src/theme_builder/components/properties/MeasureLengthPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/MeasureLengthPropertyEditor.h
diff --git a/src/theme_builder/components/properties/OptionalPropertyEditor.h b/src/ThemeBuilder/components/properties/OptionalPropertyEditor.h
index 0f22616a..0f22616a 100644
--- a/src/theme_builder/components/properties/OptionalPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/OptionalPropertyEditor.h
diff --git a/src/theme_builder/components/properties/PointPropertyEditor.cpp b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp
index 6d4277aa..6d4277aa 100644
--- a/src/theme_builder/components/properties/PointPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/PointPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/PointPropertyEditor.h b/src/ThemeBuilder/components/properties/PointPropertyEditor.h
index bd852e3a..bd852e3a 100644
--- a/src/theme_builder/components/properties/PointPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/PointPropertyEditor.h
diff --git a/src/theme_builder/components/properties/SelectPropertyEditor.cpp b/src/ThemeBuilder/components/properties/SelectPropertyEditor.cpp
index 835b2d12..835b2d12 100644
--- a/src/theme_builder/components/properties/SelectPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/SelectPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/SelectPropertyEditor.h b/src/ThemeBuilder/components/properties/SelectPropertyEditor.h
index 475d2d0a..475d2d0a 100644
--- a/src/theme_builder/components/properties/SelectPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/SelectPropertyEditor.h
diff --git a/src/theme_builder/components/properties/TextPropertyEditor.cpp b/src/ThemeBuilder/components/properties/TextPropertyEditor.cpp
index 9854019c..9854019c 100644
--- a/src/theme_builder/components/properties/TextPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/TextPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/TextPropertyEditor.h b/src/ThemeBuilder/components/properties/TextPropertyEditor.h
index c4944228..c4944228 100644
--- a/src/theme_builder/components/properties/TextPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/TextPropertyEditor.h
diff --git a/src/theme_builder/components/properties/ThicknessPropertyEditor.cpp b/src/ThemeBuilder/components/properties/ThicknessPropertyEditor.cpp
index 3e022bb1..3e022bb1 100644
--- a/src/theme_builder/components/properties/ThicknessPropertyEditor.cpp
+++ b/src/ThemeBuilder/components/properties/ThicknessPropertyEditor.cpp
diff --git a/src/theme_builder/components/properties/ThicknessPropertyEditor.h b/src/ThemeBuilder/components/properties/ThicknessPropertyEditor.h
index cea9ae9d..cea9ae9d 100644
--- a/src/theme_builder/components/properties/ThicknessPropertyEditor.h
+++ b/src/ThemeBuilder/components/properties/ThicknessPropertyEditor.h
diff --git a/src/theme_builder/components/stylers/BorderStylerEditor.cpp b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp
index 81eb66d3..81eb66d3 100644
--- a/src/theme_builder/components/stylers/BorderStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/BorderStylerEditor.h b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h
index 539262d6..539262d6 100644
--- a/src/theme_builder/components/stylers/BorderStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/BorderStylerEditor.h
diff --git a/src/theme_builder/components/stylers/CompoundStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp
index 6b8a5033..6b8a5033 100644
--- a/src/theme_builder/components/stylers/CompoundStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/CompoundStylerEditor.h b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h
index 57150e83..57150e83 100644
--- a/src/theme_builder/components/stylers/CompoundStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/CompoundStylerEditor.h
diff --git a/src/theme_builder/components/stylers/ContentBrushStylerEditor.cpp b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp
index bd649c67..bd649c67 100644
--- a/src/theme_builder/components/stylers/ContentBrushStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/ContentBrushStylerEditor.h b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h
index 8385b7c3..8385b7c3 100644
--- a/src/theme_builder/components/stylers/ContentBrushStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/ContentBrushStylerEditor.h
diff --git a/src/theme_builder/components/stylers/CursorStylerEditor.cpp b/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp
index 9984d81a..9984d81a 100644
--- a/src/theme_builder/components/stylers/CursorStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/CursorStylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/CursorStylerEditor.h b/src/ThemeBuilder/components/stylers/CursorStylerEditor.h
index 552619a0..552619a0 100644
--- a/src/theme_builder/components/stylers/CursorStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/CursorStylerEditor.h
diff --git a/src/theme_builder/components/stylers/FontStylerEditor.cpp b/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp
index 9787a4fd..9787a4fd 100644
--- a/src/theme_builder/components/stylers/FontStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/FontStylerEditor.h b/src/ThemeBuilder/components/stylers/FontStylerEditor.h
index ccd12113..ccd12113 100644
--- a/src/theme_builder/components/stylers/FontStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/FontStylerEditor.h
diff --git a/src/theme_builder/components/stylers/MarginStylerEditor.cpp b/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp
index d7d89acb..d7d89acb 100644
--- a/src/theme_builder/components/stylers/MarginStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/MarginStylerEditor.h b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h
index 9de6f1a2..9de6f1a2 100644
--- a/src/theme_builder/components/stylers/MarginStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/MarginStylerEditor.h
diff --git a/src/theme_builder/components/stylers/PaddingStylerEditor.cpp b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp
index 476d21f1..476d21f1 100644
--- a/src/theme_builder/components/stylers/PaddingStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/PaddingStylerEditor.h b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h
index b78d310b..b78d310b 100644
--- a/src/theme_builder/components/stylers/PaddingStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/PaddingStylerEditor.h
diff --git a/src/theme_builder/components/stylers/PreferredSizeStylerEditor.cpp b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp
index fb713c8c..fb713c8c 100644
--- a/src/theme_builder/components/stylers/PreferredSizeStylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/PreferredSizeStylerEditor.h b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h
index 4a64da10..4a64da10 100644
--- a/src/theme_builder/components/stylers/PreferredSizeStylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/PreferredSizeStylerEditor.h
diff --git a/src/theme_builder/components/stylers/StylerEditor.cpp b/src/ThemeBuilder/components/stylers/StylerEditor.cpp
index 0348adbd..0348adbd 100644
--- a/src/theme_builder/components/stylers/StylerEditor.cpp
+++ b/src/ThemeBuilder/components/stylers/StylerEditor.cpp
diff --git a/src/theme_builder/components/stylers/StylerEditor.h b/src/ThemeBuilder/components/stylers/StylerEditor.h
index 8aa52bda..8aa52bda 100644
--- a/src/theme_builder/components/stylers/StylerEditor.h
+++ b/src/ThemeBuilder/components/stylers/StylerEditor.h
diff --git a/src/theme_builder/main.cpp b/src/ThemeBuilder/main.cpp
index 0c5b2159..0c5b2159 100644
--- a/src/theme_builder/main.cpp
+++ b/src/ThemeBuilder/main.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c354fba9..c4133193 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,14 +1,10 @@
 include(Catch)
 
-add_library(cru_test_base INTERFACE)
-target_link_libraries(cru_test_base INTERFACE Catch2::Catch2WithMain)
+add_library(CruTestBase INTERFACE)
+target_link_libraries(CruTestBase INTERFACE Catch2::Catch2WithMain)
 
 add_subdirectory(common)
 add_subdirectory(platform)
 add_subdirectory(xml)
 add_subdirectory(toml)
 add_subdirectory(ui)
-
-if(WIN32)
-	add_subdirectory(win)
-endif()
diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt
index 17cfa85b..b3436105 100644
--- a/test/common/CMakeLists.txt
+++ b/test/common/CMakeLists.txt
@@ -5,7 +5,7 @@ add_executable(CruBaseTest
 	StringToNumberConverterTest.cpp
 	StringUtilTest.cpp
 )
-target_link_libraries(CruBaseTest PRIVATE CruBase cru_test_base)
+target_link_libraries(CruBaseTest PRIVATE CruBase CruTestBase)
 
 if (UNIX)
 	target_sources(CruBaseTest PRIVATE
@@ -18,11 +18,6 @@ if (WIN32)
 		platform/win/StreamConvertTest.cpp
 		platform/win/Win32FileStreamTest.cpp
 	)
-
-	add_custom_command(TARGET CruBaseTest POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:CruBaseTest> $<TARGET_FILE_DIR:CruBaseTest>
-	COMMAND_EXPAND_LISTS
-	)
 endif()
 
 catch_discover_tests(CruBaseTest)
diff --git a/test/platform/CMakeLists.txt b/test/platform/CMakeLists.txt
index 37bd7e4a..5116d54d 100644
--- a/test/platform/CMakeLists.txt
+++ b/test/platform/CMakeLists.txt
@@ -2,13 +2,10 @@ add_executable(CruPlatformBaseTest
 	ColorTest.cpp
 	MatrixTest.cpp
 )
-target_link_libraries(CruPlatformBaseTest PRIVATE CruPlatformBase cru_test_base)
+target_link_libraries(CruPlatformBaseTest PRIVATE CruPlatformBase CruTestBase)
 
 if (WIN32)
-	add_custom_command(TARGET CruPlatformBaseTest POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:CruPlatformBaseTest> $<TARGET_FILE_DIR:CruPlatformBaseTest>
-	COMMAND_EXPAND_LISTS
-	)
+	add_subdirectory(graphics/direct2d)
 endif()
 
 catch_discover_tests(CruPlatformBaseTest)
diff --git a/test/platform/graphics/direct2d/CMakeLists.txt b/test/platform/graphics/direct2d/CMakeLists.txt
new file mode 100644
index 00000000..66a07d15
--- /dev/null
+++ b/test/platform/graphics/direct2d/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_executable(CruPlatformGraphicsDirect2dTest
+	ConvertTest.cpp
+)
+target_link_libraries(CruPlatformGraphicsDirect2dTest PRIVATE CruPlatformGraphicsDirect2d CruTestBase)
+
+catch_discover_tests(CruPlatformGraphicsDirect2dTest)
diff --git a/test/win/graphics/direct/ConvertTest.cpp b/test/platform/graphics/direct2d/ConvertTest.cpp
index c30bb6a5..c30bb6a5 100644
--- a/test/win/graphics/direct/ConvertTest.cpp
+++ b/test/platform/graphics/direct2d/ConvertTest.cpp
diff --git a/test/toml/CMakeLists.txt b/test/toml/CMakeLists.txt
index 03f81047..30705585 100644
--- a/test/toml/CMakeLists.txt
+++ b/test/toml/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_executable(CruTomlTest
 	ParserTest.cpp
 )
-target_link_libraries(CruTomlTest PRIVATE CruToml cru_test_base)
+target_link_libraries(CruTomlTest PRIVATE CruToml CruTestBase)
 
 if (WIN32)
 	add_custom_command(TARGET CruTomlTest POST_BUILD
diff --git a/test/win/CMakeLists.txt b/test/win/CMakeLists.txt
deleted file mode 100644
index 0ebdd7fe..00000000
--- a/test/win/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(graphics)
diff --git a/test/win/graphics/CMakeLists.txt b/test/win/graphics/CMakeLists.txt
deleted file mode 100644
index c90537ac..00000000
--- a/test/win/graphics/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(direct)
diff --git a/test/win/graphics/direct/CMakeLists.txt b/test/win/graphics/direct/CMakeLists.txt
deleted file mode 100644
index c2eb0630..00000000
--- a/test/win/graphics/direct/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-add_executable(CruPlatformGraphicsDirect2dTest
-	ConvertTest.cpp
-)
-target_link_libraries(CruPlatformGraphicsDirect2dTest PRIVATE CruPlatformGraphicsDirect2d cru_test_base)
-
-if (WIN32)
-	add_custom_command(TARGET CruPlatformGraphicsDirect2dTest POST_BUILD
-	COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_RUNTIME_DLLS:CruPlatformGraphicsDirect2dTest> $<TARGET_FILE_DIR:CruPlatformGraphicsDirect2dTest>
-	COMMAND_EXPAND_LISTS
-	)
-endif()
-
-catch_discover_tests(CruPlatformGraphicsDirect2dTest)
diff --git a/test/xml/CMakeLists.txt b/test/xml/CMakeLists.txt
index 73838a35..b000c368 100644
--- a/test/xml/CMakeLists.txt
+++ b/test/xml/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_executable(CruXmlTest
 	ParserTest.cpp
 )
-target_link_libraries(CruXmlTest PRIVATE CruXml cru_test_base)
+target_link_libraries(CruXmlTest PRIVATE CruXml CruTestBase)
 
 if (WIN32)
 	add_custom_command(TARGET CruXmlTest POST_BUILD