diff --git a/ZXBStudio/Controls/ZXProjectExplorer.axaml.cs b/ZXBStudio/Controls/ZXProjectExplorer.axaml.cs
index ff2e3b1..e79493e 100644
--- a/ZXBStudio/Controls/ZXProjectExplorer.axaml.cs
+++ b/ZXBStudio/Controls/ZXProjectExplorer.axaml.cs
@@ -183,6 +183,7 @@ public void UpdateProjectFolder()
             {
                 fWatcher.Created -= FWatcher_Created;
                 fWatcher.Deleted -= FWatcher_Deleted;
+                fWatcher.Renamed -= FWatcher_Renamed;
                 fWatcher.EnableRaisingEvents = false;
                 fWatcher.Dispose();
             }
@@ -238,8 +239,15 @@ private void FWatcher_Renamed(object sender, RenamedEventArgs e)
                     else
                     {
                         var parent = FindNode(pathWithoutNode, _nodes);
-                        if (parent != null)
+                        if (parent == null)
+                        {
+                            UpdateProjectFolder();
+                            return;
+                        }
+                        else
+                        {
                             container = parent.ChildNodes;
+                        }
                     }
 
                     if (container != null)
@@ -364,8 +372,15 @@ private void FWatcher_Deleted(object sender, FileSystemEventArgs e)
                     else
                     {
                         var parent = FindNode(pathWithoutNode, _nodes);
-                        if (parent != null)
+                        if (parent == null)
+                        {
+                            UpdateProjectFolder();
+                            return;
+                        }
+                        else
+                        {
                             container = parent.ChildNodes;
+                        }
                     }
 
                     //Not found? ingnore...
@@ -404,8 +419,15 @@ private void FWatcher_Created(object sender, FileSystemEventArgs e)
                 else
                 {
                     var node = FindNode(pathWithoutNode, _nodes);
-                    if (node != null)
+                    if (node == null)
+                    {
+                        UpdateProjectFolder();
+                        return;
+                    }
+                    else
+                    {
                         container = node.ChildNodes;
+                    }
                 }
 
                 //We didn't found where to add it... :(
diff --git a/ZXBStudio/Dialogs/ZXAboutDialog.axaml b/ZXBStudio/Dialogs/ZXAboutDialog.axaml
index f0bff6b..7e43d70 100644
--- a/ZXBStudio/Dialogs/ZXAboutDialog.axaml
+++ b/ZXBStudio/Dialogs/ZXAboutDialog.axaml
@@ -10,17 +10,16 @@
         Title="About..." CanResize="False"
         WindowStartupLocation="CenterScreen"
         Topmost="True">
-  <Grid RowDefinitions="Auto,Auto,Auto,*,*,Auto,Auto,Auto,Auto,*,Auto,Auto,*,32">
+  <Grid RowDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,*,Auto,Auto,*,32">
     <Image Margin="10" Width="128" Height="128" VerticalAlignment="Top" Source="avares://ZXBasicStudio/Assets/IconAbout.png"></Image>
     <TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="36" FontWeight="Black">ZX Basic Studio</TextBlock>
-    <TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24">Beta release</TextBlock>
-    <TextBlock Grid.Row="3" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="16" Name="txtBuild">Build 1.3.5.6</TextBlock>
-    <TextBlock Grid.Row="4" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="16" Name="txtDate">2023-10-29</TextBlock>
-    <TextBlock Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextAlignment="Center" TextWrapping="Wrap" FontWeight="DemiBold">The ZX Basic Studio development team</TextBlock>
-    <TextBlock Grid.Row="7" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="18" TextWrapping="Wrap">El Dr. Gusman, Boriel, Duefectu, AdolFITO, Hash6Iron, SirRickster</TextBlock>
-    <TextBlock Grid.Row="9" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextWrapping="Wrap">Many thanks to Boriel for the ZX Basic compiler and his support to this project.</TextBlock>
-    <TextBlock Grid.Row="11" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2023, El Dr. Gusman</TextBlock>
-    <TextBlock Grid.Row="12" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2025, Boriel &amp; DuefectuCorp</TextBlock>
-    <Button Name="btnClose" Grid.Row="14">Close</Button>
+    <TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Name="txtBuild"></TextBlock>
+    <TextBlock Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" Name="txtDate"></TextBlock>
+    <TextBlock Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextAlignment="Center" TextWrapping="Wrap" FontWeight="DemiBold">The ZX Basic Studio development team</TextBlock>
+    <TextBlock Grid.Row="6" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="18" TextWrapping="Wrap">El Dr. Gusman, Boriel, Duefectu, AdolFITO, Hash6Iron, SirRickster</TextBlock>
+    <TextBlock Grid.Row="7" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextWrapping="Wrap">Many thanks to Boriel for the ZX Basic compiler and his support to this project.</TextBlock>
+    <TextBlock Grid.Row="9" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2023, El Dr. Gusman</TextBlock>
+    <TextBlock Grid.Row="10" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2025, Boriel &amp; DuefectuCorp</TextBlock>
+    <Button Name="btnClose" Grid.Row="12">Close</Button>
   </Grid>
 </Window>
diff --git a/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs b/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
index 492e168..a5ee310 100644
--- a/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
+++ b/ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs
@@ -12,21 +12,22 @@ public ZXAboutDialog()
     {
         InitializeComponent();
 
-        btnClose.Click += BtnClose_Click;
+        txtBuild.Text = "1.6.0-beta1";
+        txtDate.Text = "2025-04-26";
 
-        var name = System.Reflection.Assembly.GetExecutingAssembly().GetName();
+        btnClose.Click += BtnClose_Click;
 
-        if(name == null || name.Version == null)
-        {
-            txtBuild.Text = "Unknown build";
-            txtDate.Text = "Unknown date";
-            return;
-        }
+        //var name = System.Reflection.Assembly.GetExecutingAssembly().GetName();
 
-        DateTime buildDate = new DateTime(2000, 1, 1).AddDays(name.Version.Build);
+        //if(name == null || name.Version == null)
+        //{
+        //    txtBuild.Text = "Unknown build";
+        //    txtDate.Text = "Unknown date";
+        //    return;
+        //}
 
-        txtBuild.Text = $"Build {name.Version.ToString()}";
-        txtDate.Text = buildDate.ToString("yyyy-MM-dd");
+        //DateTime buildDate = new DateTime(2000, 1, 1).AddDays(name.Version.Revision);
+        //txtBuild.Text = $"Build {name.Version.ToString()}";
     }
 
     private void BtnClose_Click(object? sender, RoutedEventArgs e)
diff --git a/ZXBStudio/ZXBasicStudio.csproj b/ZXBStudio/ZXBasicStudio.csproj
index 7ed9650..2f96d43 100644
--- a/ZXBStudio/ZXBasicStudio.csproj
+++ b/ZXBStudio/ZXBasicStudio.csproj
@@ -11,7 +11,7 @@
     <Platforms>AnyCPU;x64</Platforms>
     <ApplicationIcon>zxbs.ico</ApplicationIcon>
     <Title>ZX Basic Studio</Title>
-    <AssemblyVersion>1.5.*</AssemblyVersion>
+    <AssemblyVersion>1.6.0.*</AssemblyVersion>
     <Deterministic>False</Deterministic>
     <Version></Version>
   </PropertyGroup>