diff --git a/SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj b/SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj
index 11538cd..6a24f32 100644
--- a/SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj
+++ b/SimpleStateMachineNodeEditor/SimpleStateMachineNodeEditor.csproj
@@ -1,9 +1,10 @@
-<project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<project Sdk="Microsoft.NET.Sdk">
 
- <propertygroup>
- <outputtype>WinExe</outputtype>
- <targetframework>netcoreapp3.1</targetframework>
- <usewpf>true</usewpf>
+ <propertygroup>
+ <outputtype>WinExe</outputtype>
+ <targetframework>net9.0-windows</targetframework>
+ <usewpf>true</usewpf>
+ <enablewindowstargeting>true</enablewindowstargeting>
 <startupobject>SimpleStateMachineNodeEditor.App</startupobject>
 <applicationicon>StateMachine.ico</applicationicon>
 <signassembly>false</signassembly>
@@ -62,17 +63,17 @@ New format for xml file with schemes</packagereleasenotes>
 </itemgroup>
 
 <itemgroup>
- <packagereference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.5" />
- <packagereference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.5" />
- <packagereference Include="Newtonsoft.Json" Version="13.0.1" />
- <packagereference Include="ReactiveUI" Version="11.4.17" />
- <packagereference Include="ReactiveUI.Events.WPF" Version="11.4.17" />
- <packagereference Include="ReactiveUI.Fody" Version="11.4.17" />
- <packagereference Include="ReactiveUI.Validation" Version="1.4.15" />
- <packagereference Include="ReactiveUI.WPF" Version="11.4.17" />
- <packagereference Include="Splat" Version="9.4.5" />
- <packagereference Include="Splat.Drawing" Version="9.4.5" />
- <packagereference Include="WritableJsonConfiguration" Version="3.1.5" />
+ <packagereference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+ <packagereference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+ <packagereference Include="Newtonsoft.Json" Version="13.0.3" />
+ <packagereference Include="ReactiveUI" Version="20.1.63" />
+ <packagereference Include="ReactiveUI.Events.WPF" Version="15.1.1" />
+ <packagereference Include="ReactiveUI.Fody" Version="19.5.41" />
+ <packagereference Include="ReactiveUI.Validation" Version="4.0.9" />
+ <packagereference Include="ReactiveUI.WPF" Version="20.1.63" />
+ <packagereference Include="Splat" Version="15.1.1" />
+ <packagereference Include="Splat.Drawing" Version="15.1.1" />
+ <packagereference Include="WritableJsonConfiguration" Version="8.0.0" />
 </itemgroup>
 
 <itemgroup>
diff --git a/SimpleStateMachineNodeEditor/ViewModel/Dialog/DialogViewModel.cs b/SimpleStateMachineNodeEditor/ViewModel/Dialog/DialogViewModel.cs
index e854d6b..a95bbdd 100644
--- a/SimpleStateMachineNodeEditor/ViewModel/Dialog/DialogViewModel.cs
+++ b/SimpleStateMachineNodeEditor/ViewModel/Dialog/DialogViewModel.cs
@@ -1,11 +1,11 @@
-using ReactiveUI.Fody.Helpers;
+using ReactiveUI.Fody.Helpers;
 using ReactiveUI.Validation.Helpers;
 using SimpleStateMachineNodeEditor.Helpers.Enums;
 using System.Windows;
 
 namespace SimpleStateMachineNodeEditor.ViewModel
 {
- public class DialogViewModel : ReactiveValidationObject<dialogviewmodel>
+ public class DialogViewModel : ReactiveValidationObject
 {
 [Reactive] public bool? Visibility { get; set; }
 [Reactive] public DialogType Type { get; set; }
diff --git a/SimpleStateMachineNodeEditor/ViewModel/MainWindow/MainWindowViewModel.cs b/SimpleStateMachineNodeEditor/ViewModel/MainWindow/MainWindowViewModel.cs
index c6c00f7..5206c03 100644
--- a/SimpleStateMachineNodeEditor/ViewModel/MainWindow/MainWindowViewModel.cs
+++ b/SimpleStateMachineNodeEditor/ViewModel/MainWindow/MainWindowViewModel.cs
@@ -1,4 +1,4 @@
-using DynamicData;
+using DynamicData;
 using DynamicData.Binding;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
@@ -57,7 +57,7 @@ private void UpdateMessages()
 bool debugEnable = DebugEnable.HasValue && DebugEnable.Value;
 bool displayAll = this.NodesCanvas.DisplayMessageType == TypeMessage.All;
 
- ConnectToMessages = this.NodesCanvas.Messages.ToObservableChangeSet().Filter(x => CheckForDisplay(x.TypeMessage)).ObserveOnDispatcher().Bind(Messages).DisposeMany().Subscribe();
+ ConnectToMessages = this.NodesCanvas.Messages.ToObservableChangeSet().Filter(x => CheckForDisplay(x.TypeMessage)).ObserveOn(RxApp.MainThreadScheduler).Bind(Messages).DisposeMany().Subscribe();
 
 bool CheckForDisplay(TypeMessage typeMessage)
 {
diff --git a/SimpleStateMachineNodeEditor/ViewModel/Node/NodeViewModel.cs b/SimpleStateMachineNodeEditor/ViewModel/Node/NodeViewModel.cs
index 0806a56..7f32141 100644
--- a/SimpleStateMachineNodeEditor/ViewModel/Node/NodeViewModel.cs
+++ b/SimpleStateMachineNodeEditor/ViewModel/Node/NodeViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Media;
 using System.Reactive.Linq;
@@ -16,7 +16,7 @@
 
 namespace SimpleStateMachineNodeEditor.ViewModel
 {
- public partial class NodeViewModel : ReactiveValidationObject<nodeviewmodel>
+ public partial class NodeViewModel : ReactiveValidationObject
 {
 [Reactive] public Point Point1 { get; set; }
 [Reactive] public Point Point2 { get; set; }
@@ -54,7 +54,7 @@ private NodeViewModel()
 Name = name;
 Zindex = nodesCanvas.Nodes.Count;
 Point1 = point;
- Transitions.Connect().ObserveOnDispatcher().Bind(TransitionsForView).Subscribe();
+ Transitions.Connect().ObserveOn(RxApp.MainThreadScheduler).Bind(TransitionsForView).Subscribe();
 SetupConnectors();
 
 SetupCommands();
diff --git a/SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/NodesCanvasViewModel.cs b/SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/NodesCanvasViewModel.cs
index 48f4bd4..1e1ef4e 100644
--- a/SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/NodesCanvasViewModel.cs
+++ b/SimpleStateMachineNodeEditor/ViewModel/NodesCanvas/NodesCanvasViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Reactive.Linq;
 using ReactiveUI;
@@ -71,7 +71,7 @@ public NodesCanvasViewModel()
 if (Theme == Themes.noCorrect) Theme = Themes.Dark;
 SetTheme(Theme);
 Cutter = new CutterViewModel(this);
- Nodes.Connect().ObserveOnDispatcher().Bind(NodesForView).Subscribe();
+ Nodes.Connect().ObserveOn(RxApp.MainThreadScheduler).Bind(NodesForView).Subscribe();
 SetupCommands();
 SetupSubscriptions();
 SetupStartState();
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://GITHUB.COM/SimpleStateMachine/SimpleStateMachineNodeEditor/compare/master...gitcg1997:SimpleStateMachineNodeEditor:master.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://GITHUB.COM/SimpleStateMachine/SimpleStateMachineNodeEditor/compare/master...gitcg1997:SimpleStateMachineNodeEditor:master.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>