diff --git a/Directory.Packages.props b/Directory.Packages.props
index f46c1fe51..caf97f003 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -3,7 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Fabulous" Version="3.0.0-pre3" />
+    <PackageVersion Include="Fabulous" Version="3.0.0-pre4" />
     <PackageVersion Include="FsCheck.NUnit" Version="2.16.4" />
     <PackageVersion Include="FSharp.Core" Version="8.0.200" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
diff --git a/extensions/Fabulous.Avalonia.ColorPicker/CHANGELOG.md b/extensions/Fabulous.Avalonia.ColorPicker/CHANGELOG.md
index da9ddd9c4..245a20321 100644
--- a/extensions/Fabulous.Avalonia.ColorPicker/CHANGELOG.md
+++ b/extensions/Fabulous.Avalonia.ColorPicker/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 _No unreleased changes_
 
+## [3.0.0-pre4] - 2024-04-19
+### Added
+- No changes
+
 ## [3.0.0-pre3] - 2024-04-13
 ### Added
 - No changes
@@ -52,7 +56,8 @@ _No unreleased changes_
 ### Added
 - Initial release
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.ColorPicker/compare/3.0.0-pre3...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.ColorPicker/compare/3.0.0-pre4...HEAD
+[3.0.0-pre4]: https://github.com/fabulous-dev/Fabulous.Avalonia.ColorPicker/releases/tag/3.0.0-pre4
 [3.0.0-pre3]: https://github.com/fabulous-dev/Fabulous.Avalonia.ColorPicker/releases/tag/3.0.0-pre3
 [3.0.0-pre2]: https://github.com/fabulous-dev/Fabulous.Avalonia.ColorPicker/releases/tag/3.0.0-pre2
 [3.0.0-pre1]: https://github.com/fabulous-dev/Fabulous.Avalonia.ColorPicker/releases/tag/3.0.0-pre1
diff --git a/extensions/Fabulous.Avalonia.DataGrid/CHANGELOG.md b/extensions/Fabulous.Avalonia.DataGrid/CHANGELOG.md
index 6d42c665c..d5b1535a5 100644
--- a/extensions/Fabulous.Avalonia.DataGrid/CHANGELOG.md
+++ b/extensions/Fabulous.Avalonia.DataGrid/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 _No unreleased changes_
 
+## [3.0.0-pre4] - 2024-04-19
+### Added
+- No changes
+
 ## [3.0.0-pre3] - 2024-04-13
 ### Added
 - No changes
@@ -52,7 +56,8 @@ _No unreleased changes_
 ### Added
 - Initial release
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.DataGrid/compare/3.0.0-pre3...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.DataGrid/compare/3.0.0-pre4...HEAD
+[3.0.0-pre4]: https://github.com/fabulous-dev/Fabulous.Avalonia.DataGrid/releases/tag/3.0.0-pre4
 [3.0.0-pre3]: https://github.com/fabulous-dev/Fabulous.Avalonia.DataGrid/releases/tag/3.0.0-pre3
 [3.0.0-pre2]: https://github.com/fabulous-dev/Fabulous.Avalonia.DataGrid/releases/tag/3.0.0-pre2
 [3.0.0-pre1]: https://github.com/fabulous-dev/Fabulous.Avalonia.DataGrid/releases/tag/3.0.0-pre1
diff --git a/extensions/Fabulous.Avalonia.ItemsRepeater/CHANGELOG.md b/extensions/Fabulous.Avalonia.ItemsRepeater/CHANGELOG.md
index ecff10747..e6caea730 100644
--- a/extensions/Fabulous.Avalonia.ItemsRepeater/CHANGELOG.md
+++ b/extensions/Fabulous.Avalonia.ItemsRepeater/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 _No unreleased changes_
 
+## [3.0.0-pre4] - 2024-04-19
+### Added
+- No changes
+
 ## [3.0.0-pre3] - 2024-04-13
 ### Added
 - No changes
@@ -48,7 +52,8 @@ _No unreleased changes_
 ### Added
 - Initial release
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.ItemsRepeater/compare/3.0.0-pre3...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.ItemsRepeater/compare/3.0.0-pre4...HEAD
+[3.0.0-pre4]: https://github.com/fabulous-dev/Fabulous.Avalonia.ItemsRepeater/releases/tag/3.0.0-pre4
 [3.0.0-pre3]: https://github.com/fabulous-dev/Fabulous.Avalonia.ItemsRepeater/releases/tag/3.0.0-pre3
 [3.0.0-pre2]: https://github.com/fabulous-dev/Fabulous.Avalonia.ItemsRepeater/releases/tag/3.0.0-pre2
 [3.0.0-pre1]: https://github.com/fabulous-dev/Fabulous.Avalonia.ItemsRepeater/releases/tag/3.0.0-pre1
diff --git a/extensions/Fabulous.Avalonia.TreeDataGrid/CHANGELOG.md b/extensions/Fabulous.Avalonia.TreeDataGrid/CHANGELOG.md
index ab644c852..f58ba4fa3 100644
--- a/extensions/Fabulous.Avalonia.TreeDataGrid/CHANGELOG.md
+++ b/extensions/Fabulous.Avalonia.TreeDataGrid/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 _No unreleased changes_
 
+## [3.0.0-pre4] - 2024-04-19
+### Added
+- No changes
+
 ## [3.0.0-pre3] - 2024-04-13
 ### Added
 - No changes
@@ -48,7 +52,8 @@ _No unreleased changes_
 ### Added
 - Initial release
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.TreeDataGrid/compare/3.0.0-pre3...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.TreeDataGrid/compare/3.0.0-pre4...HEAD
+[3.0.0-pre4]: https://github.com/fabulous-dev/Fabulous.Avalonia.TreeDataGrid/releases/tag/3.0.0-pre4
 [3.0.0-pre3]: https://github.com/fabulous-dev/Fabulous.Avalonia.TreeDataGrid/releases/tag/3.0.0-pre3
 [3.0.0-pre2]: https://github.com/fabulous-dev/Fabulous.Avalonia.TreeDataGrid/releases/tag/3.0.0-pre2
 [3.0.0-pre1]: https://github.com/fabulous-dev/Fabulous.Avalonia.TreeDataGrid/releases/tag/3.0.0-pre1
diff --git a/src/Fabulous.Avalonia/CHANGELOG.md b/src/Fabulous.Avalonia/CHANGELOG.md
index a8c55ff9f..3f5f1e356 100644
--- a/src/Fabulous.Avalonia/CHANGELOG.md
+++ b/src/Fabulous.Avalonia/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 _No unreleased changes_
 
+## [3.0.0-pre4] - 2024-04-19
+### Changed
+- Update to Fabulous 3.0.0-pre4 by @edgarfgp in https://github.com/fabulous-dev/Fabulous.Avalonia/pull/238
+
 ## [3.0.0-pre3] - 2024-04-13
 ### Changed
 - Update to Fabulous 3.0.0-pre3 by @edgarfgp in https://github.com/fabulous-dev/Fabulous.Avalonia/pull/236
@@ -218,7 +222,8 @@ _No unreleased changes_
 ### Added
 - Initial release
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia/compare/3.0.0-pre3...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia/compare/3.0.0-pre4...HEAD
+[3.0.0-pre4]: https://github.com/fabulous-dev/Fabulous.Avalonia/releases/tag/3.0.0-pre4
 [3.0.0-pre3]: https://github.com/fabulous-dev/Fabulous.Avalonia/releases/tag/3.0.0-pre3
 [3.0.0-pre2]: https://github.com/fabulous-dev/Fabulous.Avalonia/releases/tag/3.0.0-pre2
 [3.0.0-pre1]: https://github.com/fabulous-dev/Fabulous.Avalonia/releases/tag/3.0.0-pre1
diff --git a/src/Fabulous.Avalonia/Fabulous.Avalonia.fsproj b/src/Fabulous.Avalonia/Fabulous.Avalonia.fsproj
index 3a7fbc9ab..7217520c8 100644
--- a/src/Fabulous.Avalonia/Fabulous.Avalonia.fsproj
+++ b/src/Fabulous.Avalonia/Fabulous.Avalonia.fsproj
@@ -224,7 +224,7 @@
       FSharp.Core is fixed to a specific version that is not necessarily the latest one.
       This version will be used as the lower bound in the NuGet package
     -->
-    <PackageReference Condition="'$(UseLocalProjectReference)' != 'true'" Include="Fabulous" VersionOverride="[3.0.0-pre3]" />
+    <PackageReference Condition="'$(UseLocalProjectReference)' != 'true'" Include="Fabulous" VersionOverride="[3.0.0-pre4]" />
     <PackageReference Include="Avalonia" VersionOverride="11.0.10" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
   </ItemGroup>
diff --git a/templates/CHANGELOG.md b/templates/CHANGELOG.md
index 1f7404cbf..ccd0ee959 100644
--- a/templates/CHANGELOG.md
+++ b/templates/CHANGELOG.md
@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 _No unreleased changes_
 
+## [3.0.0-pre4] - 2024-04-19
+### Added
+- Update to Fabulous 3.0.0-pre4 by @edgarfgp in https://github.com/fabulous-dev/Fabulous.Avalonia/pull/238
+
 ## [3.0.0-pre3] - 2024-04-13
 ### Changed
 - Update to Fabulous 3.0.0-pre3 by @edgarfgp in https://github.com/fabulous-dev/Fabulous.Avalonia/pull/236
@@ -55,7 +59,8 @@ _No unreleased changes_
 - Add a new template for a multi-project Fabulous.Avalonia app. 
 - Fix black screen in multi-project template when targeting Browser
 
-[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.Templates/compare/3.0.0-pre3...HEAD
+[unreleased]: https://github.com/fabulous-dev/Fabulous.Avalonia.Templates/compare/3.0.0-pre4...HEAD
+[3.0.0-pre4]: https://github.com/fabulous-dev/Fabulous.Avalonia.Templates/releases/tag/3.0.0-pre4
 [3.0.0-pre3]: https://github.com/fabulous-dev/Fabulous.Avalonia.Templates/releases/tag/3.0.0-pre3
 [3.0.0-pre2]: https://github.com/fabulous-dev/Fabulous.Avalonia.Templates/releases/tag/3.0.0-pre2
 [3.0.0-pre1]: https://github.com/fabulous-dev/Fabulous.Avalonia.Templates/releases/tag/3.0.0-pre1
diff --git a/templates/content/blank/.template.config/template.json b/templates/content/blank/.template.config/template.json
index a7c65a3d6..8c8baf60a 100644
--- a/templates/content/blank/.template.config/template.json
+++ b/templates/content/blank/.template.config/template.json
@@ -44,7 +44,7 @@
       "type": "parameter",
       "dataType": "string",
       "replaces": "FabulousPkgVersion",
-      "defaultValue": "3.0.0-pre3"
+      "defaultValue": "3.0.0-pre4"
     },
     "FabulousAvaloniaPkgVersion": {
       "type": "parameter",
diff --git a/templates/content/multi/.template.config/template.json b/templates/content/multi/.template.config/template.json
index b9d52ae9b..c9d112470 100644
--- a/templates/content/multi/.template.config/template.json
+++ b/templates/content/multi/.template.config/template.json
@@ -44,7 +44,7 @@
       "type": "parameter",
       "dataType": "string",
       "replaces": "FabulousPkgVersion",
-      "defaultValue": "3.0.0-pre3"
+      "defaultValue": "3.0.0-pre4"
     },
     "FabulousAvaloniaPkgVersion": {
       "type": "parameter",