diff --git a/UserInterface/Views/BackgroundServiceSettings.axaml.cs b/UserInterface/Views/BackgroundServiceSettings.axaml.cs
index 1789bae..23588c9 100644
--- a/UserInterface/Views/BackgroundServiceSettings.axaml.cs
+++ b/UserInterface/Views/BackgroundServiceSettings.axaml.cs
@@ -1,88 +1,88 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Microsoft.Extensions.DependencyInjection;
-using hass_workstation_service.Communication.NamedPipe;
-using JKang.IpcServiceFramework.Client;
-using System.Threading.Tasks;
-using Avalonia.Interactivity;
-using System.Reactive.Linq;
-using UserInterface.ViewModels;
-using System.Security;
-using hass_workstation_service.Communication.InterProcesCommunication.Models;
-
-namespace UserInterface.Views
-{
-    public class BackgroundServiceSettings : UserControl
-    {
-        private readonly IIpcClient<ServiceContractInterfaces> _client;
-
-        public BackgroundServiceSettings()
-        {
-            this.InitializeComponent();
-            // register IPC clients
-            ServiceProvider serviceProvider = new ServiceCollection()
-                .AddNamedPipeIpcClient<ServiceContractInterfaces>("broker", pipeName: "pipeinternal")
-                .BuildServiceProvider();
-
-            // resolve IPC client factory
-            IIpcClientFactory<ServiceContractInterfaces> clientFactory = serviceProvider
-                .GetRequiredService<IIpcClientFactory<ServiceContractInterfaces>>();
-
-            // create client
-            this._client = clientFactory.CreateClient("broker");
-
-            DataContext = new BackgroundServiceSettingsViewModel();
-            Ping();
-        }
-
-        public async void Ping()
-        {
-            while (true)
-            {
-                if (DataContext is not BackgroundServiceSettingsViewModel viewModel)
-                    throw new System.Exception("Wrong viewmodel class!");
-
-                try
-                {
-                    var result = await this._client.InvokeAsync(x => x.Ping("ping"));
-
-                    if (result == "pong")
-                        viewModel.UpdateStatus(true, "All good");
-                    else
-                        viewModel.UpdateStatus(false, "Not running");
-                }
-                catch (System.Exception)
-                {
-                    viewModel.UpdateStatus(false, "Not running");
-                }
-
-                var autostartresult = await this._client.InvokeAsync(x => x.IsAutoStartEnabled());
-                viewModel.UpdateAutostartStatus(autostartresult);
-
-                await Task.Delay(1000);
-            }
-        }
-
-        public void Start(object sender, RoutedEventArgs args)
-        {
-            //TODO: fix the path. This will depend on the deployment structure.
-            System.Diagnostics.Process.Start("hass-worstation-service.exe");
-        }
-
-        public void EnableAutostart(object sender, RoutedEventArgs args)
-        {
-            this._client.InvokeAsync(x => x.EnableAutostart(true));
-        }
-
-        public void DisableAutostart(object sender, RoutedEventArgs args)
-        {
-            this._client.InvokeAsync(x => x.EnableAutostart(false));
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Microsoft.Extensions.DependencyInjection;
+using hass_workstation_service.Communication.NamedPipe;
+using JKang.IpcServiceFramework.Client;
+using System.Threading.Tasks;
+using Avalonia.Interactivity;
+using System.Reactive.Linq;
+using UserInterface.ViewModels;
+using System.Security;
+using hass_workstation_service.Communication.InterProcesCommunication.Models;
+
+namespace UserInterface.Views
+{
+    public class BackgroundServiceSettings : UserControl
+    {
+        private readonly IIpcClient<ServiceContractInterfaces> _client;
+
+        public BackgroundServiceSettings()
+        {
+            this.InitializeComponent();
+            // register IPC clients
+            ServiceProvider serviceProvider = new ServiceCollection()
+                .AddNamedPipeIpcClient<ServiceContractInterfaces>("broker", pipeName: "pipeinternal")
+                .BuildServiceProvider();
+
+            // resolve IPC client factory
+            IIpcClientFactory<ServiceContractInterfaces> clientFactory = serviceProvider
+                .GetRequiredService<IIpcClientFactory<ServiceContractInterfaces>>();
+
+            // create client
+            this._client = clientFactory.CreateClient("broker");
+
+            DataContext = new BackgroundServiceSettingsViewModel();
+            Ping();
+        }
+
+        public async void Ping()
+        {
+            while (true)
+            {
+                if (DataContext is not BackgroundServiceSettingsViewModel viewModel)
+                    throw new System.Exception("Wrong viewmodel class!");
+
+                try
+                {
+                    var result = await this._client.InvokeAsync(x => x.Ping("ping"));
+
+                    if (result == "pong")
+                        viewModel.UpdateStatus(true, "All good");
+                    else
+                        viewModel.UpdateStatus(false, "Not running");
+                }
+                catch (System.Exception)
+                {
+                    viewModel.UpdateStatus(false, "Not running");
+                }
+
+                var autostartresult = await this._client.InvokeAsync(x => x.IsAutoStartEnabled());
+                viewModel.UpdateAutostartStatus(autostartresult);
+
+                await Task.Delay(1000);
+            }
+        }
+
+        public void Start(object sender, RoutedEventArgs args)
+        {
+            //TODO: fix the path. This will depend on the deployment structure.
+            System.Diagnostics.Process.Start("hass-worstation-service.exe");
+        }
+
+        public void EnableAutostart(object sender, RoutedEventArgs args)
+        {
+            this._client.InvokeAsync(x => x.EnableAutostart(true));
+        }
+
+        public void DisableAutostart(object sender, RoutedEventArgs args)
+        {
+            this._client.InvokeAsync(x => x.EnableAutostart(false));
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
 }
\ No newline at end of file
diff --git a/UserInterface/Views/CommandSettings.axaml b/UserInterface/Views/CommandSettings.axaml
index dea407b..6998808 100644
--- a/UserInterface/Views/CommandSettings.axaml
+++ b/UserInterface/Views/CommandSettings.axaml
@@ -5,25 +5,25 @@
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="UserInterface.Views.CommandSettings">
 
-	<Grid RowDefinitions="Auto, *, Auto, Auto" Margin="30 30 30 10" >
-		<TextBlock Grid.Row="0" Margin="0 0 0 15" FontSize="18" FontWeight="Bold" Text="Commands"/>
-		<DataGrid Grid.Row="1" x:Name="Grid" IsVisible="{Binding ConfiguredCommands.Count}"
-				  AutoGenerateColumns="False" IsReadOnly="True" SelectionMode="Single"
-				  Items="{Binding ConfiguredCommands}">
-			<DataGrid.Columns>
-				<DataGridTextColumn Header="Name"
-									Binding="{Binding Name}"
-									Width="1*" />
-				<DataGridTextColumn Header="Type"
-									Binding="{Binding Type}"
-									Width="1*" />
-			</DataGrid.Columns>
-		</DataGrid>
-		<TextBlock Grid.Row="2" IsVisible="{Binding !ConfiguredCommands.Count}" Text="Add some commands by clicking the 'Add' button."/>
-		<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
-			<Button Width="75" Margin="10 10 0 0" Click="AddCommand" Content="Add"/>
-			<Button Width="75" Margin="10 10 0 0" Click="EditCommand" Content="Edit" IsVisible="False"/>
-			<Button Width="75" Margin="10 10 0 0" Click="DeleteCommand" Content="Delete"/>
-		</StackPanel>
-	</Grid>
+    <Grid RowDefinitions="Auto, *, Auto, Auto" Margin="30 30 30 10" >
+        <TextBlock Grid.Row="0" Margin="0 0 0 15" FontSize="18" FontWeight="Bold" Text="Commands"/>
+        <DataGrid Grid.Row="1" x:Name="Grid" IsVisible="{Binding ConfiguredCommands.Count}"
+                  AutoGenerateColumns="False" IsReadOnly="True" SelectionMode="Single"
+                  Items="{Binding ConfiguredCommands}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Name"
+                                    Binding="{Binding Name}"
+                                    Width="1*" />
+                <DataGridTextColumn Header="Type"
+                                    Binding="{Binding Type}"
+                                    Width="1*" />
+            </DataGrid.Columns>
+        </DataGrid>
+        <TextBlock Grid.Row="2" IsVisible="{Binding !ConfiguredCommands.Count}" Text="Add some commands by clicking the 'Add' button."/>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Width="75" Margin="10 10 0 0" Click="AddCommand" Content="Add"/>
+            <Button Width="75" Margin="10 10 0 0" Click="EditCommand" Content="Edit" IsVisible="False"/>
+            <Button Width="75" Margin="10 10 0 0" Click="DeleteCommand" Content="Delete"/>
+        </StackPanel>
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/UserInterface/Views/CommandSettings.axaml.cs b/UserInterface/Views/CommandSettings.axaml.cs
index 0f1d9d0..e9753fc 100644
--- a/UserInterface/Views/CommandSettings.axaml.cs
+++ b/UserInterface/Views/CommandSettings.axaml.cs
@@ -1,97 +1,97 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Microsoft.Extensions.DependencyInjection;
-using hass_workstation_service.Communication.NamedPipe;
-using JKang.IpcServiceFramework.Client;
-using System.Threading.Tasks;
-using Avalonia.Interactivity;
-using System.Reactive.Linq;
-using UserInterface.ViewModels;
-using System.Security;
-using hass_workstation_service.Communication.InterProcesCommunication.Models;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls.ApplicationLifetimes;
-
-namespace UserInterface.Views
-{
-    public class CommandSettings : UserControl
-    {
-        private readonly IIpcClient<ServiceContractInterfaces> _client;
-        private readonly DataGrid _dataGrid;
-        private bool _sensorsNeedToRefresh;
-
-        public CommandSettings()
-        {
-            this.InitializeComponent();
-            // register IPC clients
-            ServiceProvider serviceProvider = new ServiceCollection()
-                .AddNamedPipeIpcClient<ServiceContractInterfaces>("commands", pipeName: "pipeinternal")
-                .BuildServiceProvider();
-
-            // resolve IPC client factory
-            IIpcClientFactory<ServiceContractInterfaces> clientFactory = serviceProvider
-                .GetRequiredService<IIpcClientFactory<ServiceContractInterfaces>>();
-
-            // create client
-            this._client = clientFactory.CreateClient("commands");
-
-
-            DataContext = new CommandSettingsViewModel();
-            GetConfiguredCommands();
-
-            this._dataGrid = this.FindControl<DataGrid>("Grid");
-        }
-
-        public async void GetConfiguredCommands()
-        {
-            _sensorsNeedToRefresh = false;
-            List<ConfiguredCommandModel> status = await this._client.InvokeAsync(x => x.GetConfiguredCommands());
-
-            ((CommandSettingsViewModel)this.DataContext).ConfiguredCommands = status.Select(s =>
-                new CommandViewModel()
-                {
-                    Name = s.Name,
-                    Type = s.Type,
-                    Id = s.Id
-                }).ToList();
-        }
-
-        public async void AddCommand(object sender, RoutedEventArgs args)
-        {
-            var dialog = new AddCommandDialog();
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            {
-                await dialog.ShowDialog(desktop.MainWindow);
-                _sensorsNeedToRefresh = true;
-                GetConfiguredCommands();
-            }
-        }
-
-        public void EditCommand(object sender, RoutedEventArgs args)
-        {
-
-        }
-
-        public void DeleteCommand(object sender, RoutedEventArgs args)
-        {
-            if (_dataGrid.SelectedItem is not CommandViewModel item)
-                return;
-
-            this._client.InvokeAsync(x => x.RemoveCommandById(item.Id));
-
-            if (DataContext is not CommandSettingsViewModel viewModel)
-                return;
-
-            viewModel.ConfiguredCommands.Remove(item);
-            _dataGrid.SelectedIndex = -1;
-            viewModel.TriggerUpdate();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Microsoft.Extensions.DependencyInjection;
+using hass_workstation_service.Communication.NamedPipe;
+using JKang.IpcServiceFramework.Client;
+using System.Threading.Tasks;
+using Avalonia.Interactivity;
+using System.Reactive.Linq;
+using UserInterface.ViewModels;
+using System.Security;
+using hass_workstation_service.Communication.InterProcesCommunication.Models;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls.ApplicationLifetimes;
+
+namespace UserInterface.Views
+{
+    public class CommandSettings : UserControl
+    {
+        private readonly IIpcClient<ServiceContractInterfaces> _client;
+        private readonly DataGrid _dataGrid;
+        private bool _sensorsNeedToRefresh;
+
+        public CommandSettings()
+        {
+            this.InitializeComponent();
+            // register IPC clients
+            ServiceProvider serviceProvider = new ServiceCollection()
+                .AddNamedPipeIpcClient<ServiceContractInterfaces>("commands", pipeName: "pipeinternal")
+                .BuildServiceProvider();
+
+            // resolve IPC client factory
+            IIpcClientFactory<ServiceContractInterfaces> clientFactory = serviceProvider
+                .GetRequiredService<IIpcClientFactory<ServiceContractInterfaces>>();
+
+            // create client
+            this._client = clientFactory.CreateClient("commands");
+
+
+            DataContext = new CommandSettingsViewModel();
+            GetConfiguredCommands();
+
+            this._dataGrid = this.FindControl<DataGrid>("Grid");
+        }
+
+        public async void GetConfiguredCommands()
+        {
+            _sensorsNeedToRefresh = false;
+            List<ConfiguredCommandModel> status = await this._client.InvokeAsync(x => x.GetConfiguredCommands());
+
+            ((CommandSettingsViewModel)this.DataContext).ConfiguredCommands = status.Select(s =>
+                new CommandViewModel()
+                {
+                    Name = s.Name,
+                    Type = s.Type,
+                    Id = s.Id
+                }).ToList();
+        }
+
+        public async void AddCommand(object sender, RoutedEventArgs args)
+        {
+            var dialog = new AddCommandDialog();
+            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                await dialog.ShowDialog(desktop.MainWindow);
+                _sensorsNeedToRefresh = true;
+                GetConfiguredCommands();
+            }
+        }
+
+        public void EditCommand(object sender, RoutedEventArgs args)
+        {
+
+        }
+
+        public void DeleteCommand(object sender, RoutedEventArgs args)
+        {
+            if (_dataGrid.SelectedItem is not CommandViewModel item)
+                return;
+
+            this._client.InvokeAsync(x => x.RemoveCommandById(item.Id));
+
+            if (DataContext is not CommandSettingsViewModel viewModel)
+                return;
+
+            viewModel.ConfiguredCommands.Remove(item);
+            _dataGrid.SelectedIndex = -1;
+            viewModel.TriggerUpdate();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
 }
\ No newline at end of file
diff --git a/UserInterface/Views/MainWindow.axaml b/UserInterface/Views/MainWindow.axaml
index 61fc4ba..6c8b69b 100644
--- a/UserInterface/Views/MainWindow.axaml
+++ b/UserInterface/Views/MainWindow.axaml
@@ -7,20 +7,20 @@
         mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="500"
         x:Class="UserInterface.Views.MainWindow"
         Icon="/Assets/hass-workstation-logo.ico"
-		MinWidth="700"
-		MinHeight="500"
+        MinWidth="700"
+        MinHeight="500"
         Title="Settings">
 
-	<Design.DataContext>
-		<vm:MainWindowViewModel/>
-	</Design.DataContext>
+    <Design.DataContext>
+        <vm:MainWindowViewModel/>
+    </Design.DataContext>
 
-	<Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="*, *" Margin="10">
-		<views:BrokerSettings Grid.Column="0" Grid.Row="0" Margin="10" Grid.RowSpan="2" Background="#2D2D30"/>
-		<views:SensorSettings Grid.Column="1" Grid.Row="0" Margin="10" Background="#2D2D30"/>
-		<views:CommandSettings Grid.Column="1" Grid.Row="1" Margin="10" Background="#2D2D30"/>
-		<views:BackgroundServiceSettings Grid.Column="2" Grid.Row="0" Margin="10" Background="#2D2D30"/>
-		<views:AppInfo Grid.Column="2" Grid.Row="1" Margin="10" Background="#2D2D30"/>
-	</Grid>
+    <Grid ColumnDefinitions="Auto, *, Auto" RowDefinitions="*, *" Margin="10">
+        <views:BrokerSettings Grid.Column="0" Grid.Row="0" Margin="10" Grid.RowSpan="2" Background="#2D2D30"/>
+        <views:SensorSettings Grid.Column="1" Grid.Row="0" Margin="10" Background="#2D2D30"/>
+        <views:CommandSettings Grid.Column="1" Grid.Row="1" Margin="10" Background="#2D2D30"/>
+        <views:BackgroundServiceSettings Grid.Column="2" Grid.Row="0" Margin="10" Background="#2D2D30"/>
+        <views:AppInfo Grid.Column="2" Grid.Row="1" Margin="10" Background="#2D2D30"/>
+    </Grid>
 
 </Window>
\ No newline at end of file
diff --git a/UserInterface/Views/MainWindow.axaml.cs b/UserInterface/Views/MainWindow.axaml.cs
index dd287a5..8fb5437 100644
--- a/UserInterface/Views/MainWindow.axaml.cs
+++ b/UserInterface/Views/MainWindow.axaml.cs
@@ -9,8 +9,8 @@ namespace UserInterface.Views
     {
         public MainWindow()
         {
-            InitializeComponent();
-
+            InitializeComponent();
+
             _ = new WindowsTrayIcon();
         }
 
diff --git a/UserInterface/Views/SensorSettings.axaml b/UserInterface/Views/SensorSettings.axaml
index a5b6924..81c7e10 100644
--- a/UserInterface/Views/SensorSettings.axaml
+++ b/UserInterface/Views/SensorSettings.axaml
@@ -5,31 +5,31 @@
              mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
              x:Class="UserInterface.Views.SensorSettings">
 
-	<Grid RowDefinitions="Auto, *, Auto, Auto" Margin="30 30 30 10" >
-		<TextBlock Grid.Row="0" Margin="0 0 0 15" FontSize="18" FontWeight="Bold" Text="Sensors"/>
-		<DataGrid Grid.Row="1" x:Name="Grid" IsVisible="{Binding ConfiguredSensors.Count}"
-				  AutoGenerateColumns="False" IsReadOnly="True" SelectionMode="Single"
-				  Items="{Binding ConfiguredSensors}">
-			<DataGrid.Columns>
-				<DataGridTextColumn Header="Name"
-									Binding="{Binding Name}"
-									Width="1*" />
-				<DataGridTextColumn Header="Type"
-									Binding="{Binding Type}"
-									Width="1*" />
-				<DataGridTextColumn Header="Update Interval"
-									Binding="{Binding UpdateInterval}"
-									Width="1*" />
-				<DataGridTextColumn Header="Value"
-									Binding="{Binding ValueString}"
-									Width="2*" />
-			</DataGrid.Columns>
-		</DataGrid>
-		<TextBlock Grid.Row="2" IsVisible="{Binding !ConfiguredSensors.Count}" Text="Add some sensors by clicking the 'Add' button."/>
-		<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
-			<Button Width="75" Margin="10 10 0 0" Click="AddSensor" Content="Add"/>
-			<Button Width="75" Margin="10 10 0 0" Click="EditSensor" Content="Edit" IsVisible="False"/>
-			<Button Width="75" Margin="10 10 0 0" Click="DeleteSensor" Content="Delete"/>
-		</StackPanel>
-	</Grid>
+    <Grid RowDefinitions="Auto, *, Auto, Auto" Margin="30 30 30 10" >
+        <TextBlock Grid.Row="0" Margin="0 0 0 15" FontSize="18" FontWeight="Bold" Text="Sensors"/>
+        <DataGrid Grid.Row="1" x:Name="Grid" IsVisible="{Binding ConfiguredSensors.Count}"
+                  AutoGenerateColumns="False" IsReadOnly="True" SelectionMode="Single"
+                  Items="{Binding ConfiguredSensors}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Name"
+                                    Binding="{Binding Name}"
+                                    Width="1*" />
+                <DataGridTextColumn Header="Type"
+                                    Binding="{Binding Type}"
+                                    Width="1*" />
+                <DataGridTextColumn Header="Update Interval"
+                                    Binding="{Binding UpdateInterval}"
+                                    Width="1*" />
+                <DataGridTextColumn Header="Value"
+                                    Binding="{Binding ValueString}"
+                                    Width="2*" />
+            </DataGrid.Columns>
+        </DataGrid>
+        <TextBlock Grid.Row="2" IsVisible="{Binding !ConfiguredSensors.Count}" Text="Add some sensors by clicking the 'Add' button."/>
+        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button Width="75" Margin="10 10 0 0" Click="AddSensor" Content="Add"/>
+            <Button Width="75" Margin="10 10 0 0" Click="EditSensor" Content="Edit" IsVisible="False"/>
+            <Button Width="75" Margin="10 10 0 0" Click="DeleteSensor" Content="Delete"/>
+        </StackPanel>
+    </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/UserInterface/Views/SensorSettings.axaml.cs b/UserInterface/Views/SensorSettings.axaml.cs
index 2ac4828..9eceeb1 100644
--- a/UserInterface/Views/SensorSettings.axaml.cs
+++ b/UserInterface/Views/SensorSettings.axaml.cs
@@ -1,123 +1,123 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Microsoft.Extensions.DependencyInjection;
-using hass_workstation_service.Communication.NamedPipe;
-using JKang.IpcServiceFramework.Client;
-using System.Threading.Tasks;
-using Avalonia.Interactivity;
-using System.Reactive.Linq;
-using UserInterface.ViewModels;
-using System.Security;
-using hass_workstation_service.Communication.InterProcesCommunication.Models;
-using System.Collections.Generic;
-using System.Linq;
-using Avalonia.Controls.ApplicationLifetimes;
-
-namespace UserInterface.Views
-{
-    public class SensorSettings : UserControl
-    {
-        private readonly IIpcClient<ServiceContractInterfaces> _client;
-        private readonly DataGrid _dataGrid;
-        private bool _sensorsNeedToRefresh;
-
-        public SensorSettings()
-        {
-            this.InitializeComponent();
-            // register IPC clients
-            ServiceProvider serviceProvider = new ServiceCollection()
-                .AddNamedPipeIpcClient<ServiceContractInterfaces>("sensors", pipeName: "pipeinternal")
-                .BuildServiceProvider();
-
-            // resolve IPC client factory
-            IIpcClientFactory<ServiceContractInterfaces> clientFactory = serviceProvider
-                .GetRequiredService<IIpcClientFactory<ServiceContractInterfaces>>();
-
-            // create client
-            this._client = clientFactory.CreateClient("sensors");
-
-
-            DataContext = new SensorSettingsViewModel();
-            GetConfiguredSensors();
-
-            this._dataGrid = this.FindControl<DataGrid>("Grid");
-        }
-
-        public async void GetConfiguredSensors()
-        {
-            _sensorsNeedToRefresh = false;
-            List<ConfiguredSensorModel> status = await this._client.InvokeAsync(x => x.GetConfiguredSensors());
-
-            ((SensorSettingsViewModel)this.DataContext).ConfiguredSensors = status.Select(s =>
-                new SensorViewModel()
-                {
-                    Name = s.Name,
-                    Type = s.Type,
-                    Value = s.Value,
-                    Id = s.Id,
-                    UpdateInterval = s.UpdateInterval,
-                    UnitOfMeasurement = s.UnitOfMeasurement
-                }).ToList();
-
-            while (!_sensorsNeedToRefresh)
-            {
-                await Task.Delay(1000);
-                List<ConfiguredSensorModel> statusUpdated = await this._client.InvokeAsync(x => x.GetConfiguredSensors());
-                var configuredSensors = ((SensorSettingsViewModel)this.DataContext).ConfiguredSensors;
-                // this is a workaround for the list showing before it has been completely loaded in the service
-                if (statusUpdated.Count != configuredSensors.Count)
-                {
-                    _sensorsNeedToRefresh = true;
-                    GetConfiguredSensors();
-                }
-                statusUpdated.ForEach(s =>
-                {
-                    var configuredSensor = configuredSensors.FirstOrDefault(cs => cs.Id == s.Id);
-                    if (configuredSensor != null)
-                    {
-                        configuredSensor.Value = s.Value;
-
-                        configuredSensors.FirstOrDefault(cs => cs.Id == s.Id).Value = s.Value;
-                    }
-                });
-            }
-        }
-
-        public async void AddSensor(object sender, RoutedEventArgs args)
-        {
-            var dialog = new AddSensorDialog();
-            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            {
-                await dialog.ShowDialog(desktop.MainWindow);
-                _sensorsNeedToRefresh = true;
-                GetConfiguredSensors();
-            }
-        }
-
-        public void EditSensor(object sender, RoutedEventArgs args)
-        {
-
-        }
-
-        public void DeleteSensor(object sender, RoutedEventArgs args)
-        {
-            if (_dataGrid.SelectedItem is not SensorViewModel item)
-                return;
-
-            this._client.InvokeAsync(x => x.RemoveSensorById(item.Id));
-
-            if (DataContext is not SensorSettingsViewModel viewModel)
-                return;
-
-            viewModel.ConfiguredSensors.Remove(item);
-            _dataGrid.SelectedIndex = -1;
-            viewModel.TriggerUpdate();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-    }
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+using Microsoft.Extensions.DependencyInjection;
+using hass_workstation_service.Communication.NamedPipe;
+using JKang.IpcServiceFramework.Client;
+using System.Threading.Tasks;
+using Avalonia.Interactivity;
+using System.Reactive.Linq;
+using UserInterface.ViewModels;
+using System.Security;
+using hass_workstation_service.Communication.InterProcesCommunication.Models;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Controls.ApplicationLifetimes;
+
+namespace UserInterface.Views
+{
+    public class SensorSettings : UserControl
+    {
+        private readonly IIpcClient<ServiceContractInterfaces> _client;
+        private readonly DataGrid _dataGrid;
+        private bool _sensorsNeedToRefresh;
+
+        public SensorSettings()
+        {
+            this.InitializeComponent();
+            // register IPC clients
+            ServiceProvider serviceProvider = new ServiceCollection()
+                .AddNamedPipeIpcClient<ServiceContractInterfaces>("sensors", pipeName: "pipeinternal")
+                .BuildServiceProvider();
+
+            // resolve IPC client factory
+            IIpcClientFactory<ServiceContractInterfaces> clientFactory = serviceProvider
+                .GetRequiredService<IIpcClientFactory<ServiceContractInterfaces>>();
+
+            // create client
+            this._client = clientFactory.CreateClient("sensors");
+
+
+            DataContext = new SensorSettingsViewModel();
+            GetConfiguredSensors();
+
+            this._dataGrid = this.FindControl<DataGrid>("Grid");
+        }
+
+        public async void GetConfiguredSensors()
+        {
+            _sensorsNeedToRefresh = false;
+            List<ConfiguredSensorModel> status = await this._client.InvokeAsync(x => x.GetConfiguredSensors());
+
+            ((SensorSettingsViewModel)this.DataContext).ConfiguredSensors = status.Select(s =>
+                new SensorViewModel()
+                {
+                    Name = s.Name,
+                    Type = s.Type,
+                    Value = s.Value,
+                    Id = s.Id,
+                    UpdateInterval = s.UpdateInterval,
+                    UnitOfMeasurement = s.UnitOfMeasurement
+                }).ToList();
+
+            while (!_sensorsNeedToRefresh)
+            {
+                await Task.Delay(1000);
+                List<ConfiguredSensorModel> statusUpdated = await this._client.InvokeAsync(x => x.GetConfiguredSensors());
+                var configuredSensors = ((SensorSettingsViewModel)this.DataContext).ConfiguredSensors;
+                // this is a workaround for the list showing before it has been completely loaded in the service
+                if (statusUpdated.Count != configuredSensors.Count)
+                {
+                    _sensorsNeedToRefresh = true;
+                    GetConfiguredSensors();
+                }
+                statusUpdated.ForEach(s =>
+                {
+                    var configuredSensor = configuredSensors.FirstOrDefault(cs => cs.Id == s.Id);
+                    if (configuredSensor != null)
+                    {
+                        configuredSensor.Value = s.Value;
+
+                        configuredSensors.FirstOrDefault(cs => cs.Id == s.Id).Value = s.Value;
+                    }
+                });
+            }
+        }
+
+        public async void AddSensor(object sender, RoutedEventArgs args)
+        {
+            var dialog = new AddSensorDialog();
+            if (Application.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                await dialog.ShowDialog(desktop.MainWindow);
+                _sensorsNeedToRefresh = true;
+                GetConfiguredSensors();
+            }
+        }
+
+        public void EditSensor(object sender, RoutedEventArgs args)
+        {
+
+        }
+
+        public void DeleteSensor(object sender, RoutedEventArgs args)
+        {
+            if (_dataGrid.SelectedItem is not SensorViewModel item)
+                return;
+
+            this._client.InvokeAsync(x => x.RemoveSensorById(item.Id));
+
+            if (DataContext is not SensorSettingsViewModel viewModel)
+                return;
+
+            viewModel.ConfiguredSensors.Remove(item);
+            _dataGrid.SelectedIndex = -1;
+            viewModel.TriggerUpdate();
+        }
+
+        private void InitializeComponent()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+    }
 }
\ No newline at end of file