diff --git a/Modules/PSO2Logger.Modules.Chat/Behaviors/DataGridBehavior.cs b/Modules/PSO2Logger.Modules.Chat/Behaviors/DataGridBehavior.cs
index 5e8cd30..5f92247 100644
--- a/Modules/PSO2Logger.Modules.Chat/Behaviors/DataGridBehavior.cs
+++ b/Modules/PSO2Logger.Modules.Chat/Behaviors/DataGridBehavior.cs
@@ -7,13 +7,16 @@
 namespace PSO2Logger.Modules.Chat.Behaviors {
     class DataGridBehavior {
         public static readonly DependencyProperty AutoscrollProperty = DependencyProperty.RegisterAttached(
-       "Autoscroll", typeof(bool), typeof(DataGridBehavior), new PropertyMetadata(default(bool), OnAutoScrollPropertyChanged));
+            "Autoscroll", 
+            typeof(bool), 
+            typeof(DataGridBehavior), 
+            new PropertyMetadata(default(bool), OnAutoScrollPropertyChanged)
+        );
 
-        private static readonly Dictionary<DataGrid, NotifyCollectionChangedEventHandler> handlersDict = new Dictionary<DataGrid, NotifyCollectionChangedEventHandler>();
+        private static readonly Dictionary<DataGrid, NotifyCollectionChangedEventHandler> handlersDict = new();
 
         private static void OnAutoScrollPropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs args) {
-            var dataGrid = dependencyObject as DataGrid;
-            if (dataGrid == null) {
+            if (dependencyObject is not DataGrid dataGrid) {
                 throw new InvalidOperationException("Dependency object is not DataGrid.");
             }
 
diff --git a/Modules/PSO2Logger.Modules.Chat/Converters/ChatTypeColorConverter.cs b/Modules/PSO2Logger.Modules.Chat/Converters/ChatTypeColorConverter.cs
new file mode 100644
index 0000000..8371105
--- /dev/null
+++ b/Modules/PSO2Logger.Modules.Chat/Converters/ChatTypeColorConverter.cs
@@ -0,0 +1,28 @@
+using PSO2Logger.Models;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace PSO2Logger.Modules.Chat.Converters {
+    class ChatTypeColorConverter : IValueConverter {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture) {
+            return value switch {
+                ChatType.PUBLIC => Color.White.Name,
+                ChatType.PARTY => "#53A2BA",
+                ChatType.GUILD => "#CECA66",
+                ChatType.REPLY => "#BA536E",
+                ChatType.GROUP => "#53BA85",
+                _ => Color.White.ToString(),
+            };
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Modules/PSO2Logger.Modules.Chat/Core/DefaultChatColor.cs b/Modules/PSO2Logger.Modules.Chat/Core/DefaultChatColor.cs
new file mode 100644
index 0000000..8bede2e
--- /dev/null
+++ b/Modules/PSO2Logger.Modules.Chat/Core/DefaultChatColor.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PSO2Logger.Modules.Chat.Core {
+    static class DefaultChatColor {
+        readonly static string PublicChat = "White";
+        readonly static string PartyChat = "Blue";
+        readonly static string TeamChat = "Yellow";
+        readonly static string WhisperChat = "Cyan";
+        readonly static string GroupChat = "Green";
+    }
+}
diff --git a/Modules/PSO2Logger.Modules.Chat/Interfaces/IChatDataStore.cs b/Modules/PSO2Logger.Modules.Chat/Interfaces/IChatDataStore.cs
deleted file mode 100644
index f30ced1..0000000
--- a/Modules/PSO2Logger.Modules.Chat/Interfaces/IChatDataStore.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using PSO2Logger.Interfaces;
-using PSO2Logger.Models;
-using Reactive.Bindings;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PSO2Logger.Modules.Chat.Interfaces {
-    interface IChatDataStore {
-        ReactiveCollection<ChatLine> ChatLines { get; }
-        ILogService<ChatLine> LogService { get; }
-        IWatcherService WatcherService { get; }
-
-        IList<ChatLine> GetNewLines();
-        void OverrideLogService(ILogService<ChatLine> logService);
-        void OverrideWatcherService(IWatcherService watcherService);
-    }
-}
diff --git a/Modules/PSO2Logger.Modules.Chat/Models/ChatDataStore.cs b/Modules/PSO2Logger.Modules.Chat/Models/ChatDataStore.cs
index 2e91805..f442737 100644
--- a/Modules/PSO2Logger.Modules.Chat/Models/ChatDataStore.cs
+++ b/Modules/PSO2Logger.Modules.Chat/Models/ChatDataStore.cs
@@ -8,7 +8,6 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace PSO2Logger.Modules.Chat.Models {
diff --git a/Modules/PSO2Logger.Modules.Chat/Settings.cs b/Modules/PSO2Logger.Modules.Chat/Settings.cs
new file mode 100644
index 0000000..26adcf2
--- /dev/null
+++ b/Modules/PSO2Logger.Modules.Chat/Settings.cs
@@ -0,0 +1,28 @@
+namespace PSO2Logger.Modules.Chat.Properties {
+    
+    
+    // このクラスでは設定クラスでの特定のイベントを処理することができます:
+    //  SettingChanging イベントは、設定値が変更される前に発生します。
+    //  PropertyChanged イベントは、設定値が変更された後に発生します。
+    //  SettingsLoaded イベントは、設定値が読み込まれた後に発生します。
+    //  SettingsSaving イベントは、設定値が保存される前に発生します。
+    internal sealed partial class Settings {
+        
+        public Settings() {
+            // // 設定の保存と変更のイベント ハンドラーを追加するには、以下の行のコメントを解除します:
+            //
+            // this.SettingChanging += this.SettingChangingEventHandler;
+            //
+            // this.SettingsSaving += this.SettingsSavingEventHandler;
+            //
+        }
+        
+        private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
+            // SettingChangingEvent イベントを処理するコードをここに追加してください。
+        }
+        
+        private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+            // SettingsSaving イベントを処理するコードをここに追加してください。
+        }
+    }
+}
diff --git a/Modules/PSO2Logger.Modules.Chat/ViewModels/CombinedChatViewModel.cs b/Modules/PSO2Logger.Modules.Chat/ViewModels/CombinedChatViewModel.cs
index 7f4bf16..f92c5d1 100644
--- a/Modules/PSO2Logger.Modules.Chat/ViewModels/CombinedChatViewModel.cs
+++ b/Modules/PSO2Logger.Modules.Chat/ViewModels/CombinedChatViewModel.cs
@@ -1,15 +1,8 @@
-using Prism.Commands;
-using Prism.Mvvm;
-using Prism.Regions;
-using PSO2Logger.Core;
+using Prism.Mvvm;
 using PSO2Logger.Interfaces;
 using PSO2Logger.Models;
 using PSO2Logger.Modules.Chat.Models;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.Linq;
 using System.Windows.Data;
 
 namespace PSO2Logger.Modules.Chat.ViewModels {
@@ -20,7 +13,37 @@ public class CombinedChatViewModel : BindableBase {
         public ObservableCollection<ChatLine> PartyChats { get; set; } 
         public ObservableCollection<ChatLine> TeamChats { get; set; }
         public ObservableCollection<ChatLine> WhisperChats { get; set; } 
-        public ObservableCollection<ChatLine> GroupChats { get; set; } 
+        public ObservableCollection<ChatLine> GroupChats { get; set; }
+
+        private string _publicChatColor;
+        public string PublicChatColor {
+            get { return _publicChatColor; }
+            set { SetProperty(ref _publicChatColor, value); }
+        }
+
+        private string _partyChatColor;
+        public string PartyChatColor {
+            get { return _partyChatColor; }
+            set { SetProperty(ref _partyChatColor, value); }
+        }
+
+        private string _teamChatColor;
+        public string TeamChatColor {
+            get { return _teamChatColor; }
+            set { SetProperty(ref _teamChatColor, value); }
+        }
+
+        private string _whisperChatColor;
+        public string WhisperChatColor {
+            get { return _whisperChatColor; }
+            set { SetProperty(ref _whisperChatColor, value); }
+        }
+
+        private string _groupChatColor;
+        public string GroupChatColor {
+            get { return _groupChatColor; }
+            set { SetProperty(ref _groupChatColor, value); }
+        }
 
         public CombinedChatViewModel(ILogService<ChatLine> logService, IWatcherService watcherService) {
             chatDataStore = new ChatDataStore(logService, watcherService);
diff --git a/Modules/PSO2Logger.Modules.Chat/Views/CombinedChat.xaml b/Modules/PSO2Logger.Modules.Chat/Views/CombinedChat.xaml
index 8a0dd96..17cf60d 100644
--- a/Modules/PSO2Logger.Modules.Chat/Views/CombinedChat.xaml
+++ b/Modules/PSO2Logger.Modules.Chat/Views/CombinedChat.xaml
@@ -6,19 +6,58 @@
              mc:Ignorable="d"
              xmlns:prism="http://prismlibrary.com/"
              xmlns:core="clr-namespace:PSO2Logger.Core;assembly=PSO2Logger.Core"
+             xmlns:model="clr-namespace:PSO2Logger.Models;assembly=PSO2Logger.Models"
              xmlns:behavior="clr-namespace:PSO2Logger.Modules.Chat.Behaviors"
+             xmlns:converter="clr-namespace:PSO2Logger.Modules.Chat.Converters"
              prism:ViewModelLocator.AutoWireViewModel="True">
 
     <UserControl.Resources>
+        <!-- Converters -->
+        <converter:ChatTypeColorConverter x:Key="ChatTypeColorConverter" />
+
+        <!-- Style and template for the DataGrid -->
         <Style TargetType="DataGrid" BasedOn="{StaticResource MaterialDesignDataGrid}">
             <Setter Property="IsReadOnly" Value="True" />
             <Setter Property="CanUserResizeColumns" Value="False" />
             <Setter Property="behavior:DataGridBehavior.Autoscroll" Value="True" />
             <Setter Property="AutoGenerateColumns" Value="False" />
         </Style>
-        <Style TargetType="TextBlock" BasedOn="{StaticResource MahApps.Styles.Hyperlink.DataGrid}">
-            <Setter Property="HorizontalAlignment" Value="Stretch" />
-            <Setter Property="TextWrapping" Value="Wrap" />
+
+        <!-- Style and template for the DataGridColumnHeader. -->
+        <Style TargetType="DataGridColumnHeader" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="DataGridColumnHeader">
+                        <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=Name}" />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        
+        <!-- Style and template for the DataGridCellTemplate -->
+        <Style TargetType="DataGridCell" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="DataGridCell">
+                        <StackPanel VerticalAlignment="Stretch">
+                            <DockPanel LastChildFill="True">
+                                <TextBlock x:Name="PlayerIDName" 
+                                           Text="{Binding PlayerIDName}"
+                                           TextWrapping="Wrap"
+                                           Foreground="{Binding ChatType, Converter={StaticResource ChatTypeColorConverter}}"/>
+                                <TextBlock DockPanel.Dock="Right" 
+                                           HorizontalAlignment="Right" 
+                                           Text="{Binding TimeStamp, StringFormat={}{0:tt hh:mm}}"
+                                           Foreground="{Binding Foreground ,ElementName=PlayerIDName}"/>
+                            </DockPanel>
+                            <TextBlock Text="{Binding ChatBody}"
+                                       Margin="10 0 0 0"
+                                       TextWrapping="Wrap"
+                                       Foreground="{Binding Foreground ,ElementName=PlayerIDName}"/>
+                        </StackPanel>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
         </Style>
     </UserControl.Resources>
 
@@ -31,104 +70,44 @@
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
 
+        <!-- PublicChat -->
         <DataGrid Grid.Column="0"
                   ItemsSource="{Binding PublicChats}"
-                  Name="PUBLIC" >
+                  Name="PUBLIC">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Width="*">
-                    <DataGridTemplateColumn.Header>
-                        <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=Name}" />
-                    </DataGridTemplateColumn.Header>
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <StackPanel VerticalAlignment="Stretch">
-                                <TextBlock Text="{Binding PlayerIDName}" />
-                                <TextBlock Text="{Binding ChatBody}"
-                                           Margin="10 0 0 0" />
-                            </StackPanel>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Width="*"/>
             </DataGrid.Columns>
         </DataGrid>
+        <!-- PartyChat -->
         <DataGrid Grid.Column="1"
                   ItemsSource="{Binding PartyChats}"
                   Name="PARTY">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Width="*">
-                    <DataGridTemplateColumn.Header>
-                        <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=Name}" />
-                    </DataGridTemplateColumn.Header>
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <StackPanel VerticalAlignment="Stretch">
-                                <TextBlock Text="{Binding PlayerIDName}" />
-                                <TextBlock Text="{Binding ChatBody}"
-                                           Margin="10 0 0 0" />
-                            </StackPanel>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Width="*"/>
             </DataGrid.Columns>
         </DataGrid>
+        <!-- TeamChat -->
         <DataGrid Grid.Column="2"
                   ItemsSource="{Binding TeamChats}"
-                  Name="TEAM" >
+                  Name="TEAM">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Width="*">
-                    <DataGridTemplateColumn.Header>
-                        <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=Name}" />
-                    </DataGridTemplateColumn.Header>
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <StackPanel VerticalAlignment="Stretch">
-                                <TextBlock Text="{Binding PlayerIDName}" />
-                                <TextBlock Text="{Binding ChatBody}"
-                                           Margin="10 0 0 0" />
-                            </StackPanel>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Width="*"/>
             </DataGrid.Columns>
         </DataGrid>
+        <!-- WhisperChat -->
         <DataGrid Grid.Column="3"
                   ItemsSource="{Binding WhisperChats}"
                   Name="WHISPER">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Width="*">
-                    <DataGridTemplateColumn.Header>
-                        <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=Name}" />
-                    </DataGridTemplateColumn.Header>
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <StackPanel VerticalAlignment="Stretch">
-                                <TextBlock Text="{Binding PlayerIDName}" />
-                                <TextBlock Text="{Binding ChatBody}"
-                                           Margin="10 0 0 0" />
-                            </StackPanel>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Width="*"/>
             </DataGrid.Columns>
         </DataGrid>
+        <!-- GroupChat -->
         <DataGrid Grid.Column="4"
                   ItemsSource="{Binding GroupChats}"
-                  Name="GROUP" >
+                  Name="GROUP">
             <DataGrid.Columns>
-                <DataGridTemplateColumn Width="*">
-                    <DataGridTemplateColumn.Header>
-                        <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}, Path=Name}" />
-                    </DataGridTemplateColumn.Header>
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <StackPanel VerticalAlignment="Stretch">
-                                <TextBlock Text="{Binding PlayerIDName}" />
-                                <TextBlock Text="{Binding ChatBody}"
-                                           Margin="10 0 0 0" />
-                            </StackPanel>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Width="*"/>
             </DataGrid.Columns>
         </DataGrid>
     </Grid>
diff --git a/Modules/PSO2Logger.Modules.Settings/PSO2Logger.Modules.Settings.csproj b/Modules/PSO2Logger.Modules.Settings/PSO2Logger.Modules.Settings.csproj
index f815cdc..9fa7780 100644
--- a/Modules/PSO2Logger.Modules.Settings/PSO2Logger.Modules.Settings.csproj
+++ b/Modules/PSO2Logger.Modules.Settings/PSO2Logger.Modules.Settings.csproj
@@ -13,5 +13,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\PSO2Logger.Core\PSO2Logger.Core.csproj" />
+    <ProjectReference Include="..\..\PSO2Logger.Services\PSO2Logger.Services.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Modules/PSO2Logger.Modules.Settings/ViewModels/SettingViewModel.cs b/Modules/PSO2Logger.Modules.Settings/ViewModels/SettingViewModel.cs
index 2056ecc..2bbeef0 100644
--- a/Modules/PSO2Logger.Modules.Settings/ViewModels/SettingViewModel.cs
+++ b/Modules/PSO2Logger.Modules.Settings/ViewModels/SettingViewModel.cs
@@ -1,19 +1,40 @@
 using Prism.Commands;
 using Prism.Mvvm;
+using PSO2Logger.Interfaces;
+using PSO2Logger.Models;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 
 namespace PSO2Logger.Modules.Settings.ViewModels {
     public class SettingViewModel : BindableBase {
+        private readonly ILogService<ChatLine> logService;
+        private readonly IWatcherService watcherService;
+
         private string _folderPath;
+
         public string FolderPath {
             get { return _folderPath; }
-            set { SetProperty(ref _folderPath, value); }
+            set { 
+                SetProperty(ref _folderPath, value);
+                UpdateServiceFolderPath(value);
+            }
+        }
+
+        public SettingViewModel(ILogService<ChatLine> logService, IWatcherService watcherService) {
+            this.logService = logService;
+            this.watcherService = watcherService;
+
+            FolderPath = logService.FolderPath;
         }
 
-        public SettingViewModel() {
+        private void UpdateServiceFolderPath(string folderPath) {
+            if (!Directory.Exists(folderPath))
+                return;
 
+            this.logService.FolderPath = folderPath;
+            this.watcherService.FolderPath = folderPath;
         }
     }
 }
diff --git a/Modules/PSO2Logger.Modules.Settings/Views/Setting.xaml b/Modules/PSO2Logger.Modules.Settings/Views/Setting.xaml
index c93f269..17cdde2 100644
--- a/Modules/PSO2Logger.Modules.Settings/Views/Setting.xaml
+++ b/Modules/PSO2Logger.Modules.Settings/Views/Setting.xaml
@@ -15,13 +15,28 @@
             <Setter Property="FontSize" Value="30" />
         </Style>
     </UserControl.Resources>
-    
-    <StackPanel Margin="10">
-        <DockPanel Margin="5" LastChildFill="True">
-            <TextBlock Text="Folder Path" DockPanel.Dock="Left"/>
-            <TextBox Text="{Binding FolderPath}" 
-                     MinWidth="300"
-                     Width="Auto" />
-        </DockPanel>
+
+    <StackPanel Orientation="Vertical">
+
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="5*" />
+                <ColumnDefinition Width="*" MaxWidth="100" />
+            </Grid.ColumnDefinitions>
+            
+            <StackPanel Margin="10 10 0 10">
+                <DockPanel Margin="5" LastChildFill="True">
+                    <TextBlock Text="Folder Path" DockPanel.Dock="Left"/>
+                    <TextBox Text="{Binding FolderPath}" 
+                             MinWidth="300"
+                             Width="Auto" />
+                </DockPanel>
+            </StackPanel>
+            <Button Grid.Column="1"
+                    Content="..."
+                    Margin="10 0 10 0"
+                    Command="{Binding PickDirectoryCommand}"/>
+        </Grid>
+        
     </StackPanel>
 </UserControl>
diff --git a/PSO2Logger.Services/ChatLogService.cs b/PSO2Logger.Services/ChatLogService.cs
index 7d5ba7b..5e584ce 100644
--- a/PSO2Logger.Services/ChatLogService.cs
+++ b/PSO2Logger.Services/ChatLogService.cs
@@ -18,6 +18,7 @@ public class ChatLogService : ILogService<ChatLine>, IDisposable {
         public string FolderPath { get; set; }
 
         public ChatLogService() {
+            // TODO: Obsolete this ctor. (Path's should be specified by outside.)
             FolderPath = defaultLogPath;
             FileName = GetLatestFileName(FolderPath);
         }
diff --git a/PSO2Logger.Services/FileWatcherService.cs b/PSO2Logger.Services/FileWatcherService.cs
index 3dd97fa..7d46658 100644
--- a/PSO2Logger.Services/FileWatcherService.cs
+++ b/PSO2Logger.Services/FileWatcherService.cs
@@ -7,7 +7,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace PSO2Logger.Services {
+namespace PSO2Logger.Services { 
+    [Obsolete]
     public class FileWatcherService : IWatcherService, IDisposable {
         /// <summary>
         /// ファイルが変更されたときに通知します。
diff --git a/PSO2Logger.Services/MockWatcherService.cs b/PSO2Logger.Services/MockWatcherService.cs
new file mode 100644
index 0000000..db62747
--- /dev/null
+++ b/PSO2Logger.Services/MockWatcherService.cs
@@ -0,0 +1,27 @@
+using PSO2Logger.Interfaces;
+using PSO2Logger.Interfaces.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace PSO2Logger.Services {
+    // TODO: ReWriteWatcherService which implements new file detector.
+    public class MockWatcherService : IWatcherService {
+        public string FolderPath { get; set; }
+        public string FileName { get; set; }
+        public bool CanRaiseEvent { get; set; } = true;
+
+        public event EventHandler<WatcherEventArgs> OnChanged;
+
+        public void RunScanRoop() {
+            var watcherEventArgs = new WatcherEventArgs(null, WatchType.FileChanged);
+            while (CanRaiseEvent is true) {
+                Thread.Sleep(1000);
+                OnChanged?.Invoke(this, watcherEventArgs);
+            }
+        }
+    }
+}
diff --git a/PSO2Logger/App.xaml.cs b/PSO2Logger/App.xaml.cs
index e8b74af..79b830d 100644
--- a/PSO2Logger/App.xaml.cs
+++ b/PSO2Logger/App.xaml.cs
@@ -18,7 +18,8 @@ protected override Window CreateShell() {
         }
 
         protected override void RegisterTypes(IContainerRegistry containerRegistry) {
-            containerRegistry.RegisterSingleton<IWatcherService, FileWatcherService>();
+            // TODO: Initialize Services with SavedFolderPath
+            containerRegistry.RegisterSingleton<IWatcherService, MockWatcherService>();
             containerRegistry.RegisterSingleton<ILogService<ChatLine>, ChatLogService>();
         }
 
diff --git a/PSO2Logger/PSO2Logger.csproj b/PSO2Logger/PSO2Logger.csproj
index 9d22022..f4bd5ba 100644
--- a/PSO2Logger/PSO2Logger.csproj
+++ b/PSO2Logger/PSO2Logger.csproj
@@ -4,6 +4,10 @@
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <AssemblyName>PSO2Logger</AssemblyName>
+    <Authors>shusann01116</Authors>
+    <Company />
+    <NeutralLanguage>ja-JP</NeutralLanguage>
+    <RepositoryUrl>https://github.com/shusann01116/PSO2Logger</RepositoryUrl>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MahApps.Metro" Version="2.4.7" />
diff --git a/PSO2Logger/ViewModels/MainWindowViewModel.cs b/PSO2Logger/ViewModels/MainWindowViewModel.cs
index 20bb32f..e3b3207 100644
--- a/PSO2Logger/ViewModels/MainWindowViewModel.cs
+++ b/PSO2Logger/ViewModels/MainWindowViewModel.cs
@@ -6,7 +6,7 @@
 
 namespace PSO2Logger.ViewModels {
     public class MainWindowViewModel : BindableBase {
-        private string _title = "Prism Application";
+        private string _title = "PSO2 Logger";
         public string Title {
             get { return _title; }
             set { SetProperty(ref _title, value); }
diff --git a/PSO2Logger/Views/MainWindow.xaml b/PSO2Logger/Views/MainWindow.xaml
index a195b24..c5bb8ce 100644
--- a/PSO2Logger/Views/MainWindow.xaml
+++ b/PSO2Logger/Views/MainWindow.xaml
@@ -9,7 +9,7 @@
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
         xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
         prism:ViewModelLocator.AutoWireViewModel="True"
-        Title="{Binding Title}" Height="350" Width="525"
+        Title="{Binding Title}" Height="720" Width="1440"
         mah:SaveWindowPosition="True">
 
     <mah:MetroWindow.Resources>