diff --git a/build/Avalonia.Desktop.props b/build/Avalonia.Desktop.props
index 10a692d..6cf67fe 100644
--- a/build/Avalonia.Desktop.props
+++ b/build/Avalonia.Desktop.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-rc2" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.Diagnostics.props b/build/Avalonia.Diagnostics.props
index c7dee90..a408f84 100644
--- a/build/Avalonia.Diagnostics.props
+++ b/build/Avalonia.Diagnostics.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-rc2" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.ReactiveUI.props b/build/Avalonia.ReactiveUI.props
index 2baf34d..0871274 100644
--- a/build/Avalonia.ReactiveUI.props
+++ b/build/Avalonia.ReactiveUI.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-rc2" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Avalonia.props b/build/Avalonia.props
index 329a445..3a6208d 100644
--- a/build/Avalonia.props
+++ b/build/Avalonia.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.0-rc2" />
+    <PackageReference Include="Avalonia" Version="0.10.0" />
   </ItemGroup>
 </Project>
diff --git a/build/Base.props b/build/Base.props
index c722be3..885b230 100644
--- a/build/Base.props
+++ b/build/Base.props
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VersionPrefix>0.10.0</VersionPrefix>
-    <VersionSuffix>rc2</VersionSuffix>
+    <VersionSuffix></VersionSuffix>
     <Authors>Wiesław Šoltés</Authors>
     <Company>Wiesław Šoltés</Company>
     <Copyright>Copyright © Wiesław Šoltés 2021</Copyright>
diff --git a/src/ThemeEditor/MainView.axaml.cs b/src/ThemeEditor/MainView.axaml.cs
index 6cee630..34be777 100644
--- a/src/ThemeEditor/MainView.axaml.cs
+++ b/src/ThemeEditor/MainView.axaml.cs
@@ -64,9 +64,12 @@ namespace ThemeEditor
             {
                 var previewView = this.Find<ThemePreviewView>("previewView");
                 var exportText = this.Find<TextBox>("exportText");
-                var defaultThem = editor.GetTheme(_lightTheme);
-                defaultThem.Name = "BaseLight";
-                editor.DefaultTheme = defaultThem;
+                if (_lightTheme is not null)
+                {
+                    var defaultThem = editor.GetTheme(_lightTheme);
+                    defaultThem.Name = "BaseLight";
+                    editor.DefaultTheme = defaultThem;
+                }
                 editor.Attach(previewView.Resources, (x) => exportText.Text = x.ToXaml());
             }
         }