diff --git a/HueLib2/Bridge/Bridge.cs b/HueLib2/Bridge/Bridge.cs
index 79f4b791..f9a86a81 100644
--- a/HueLib2/Bridge/Bridge.cs
+++ b/HueLib2/Bridge/Bridge.cs
@@ -18,11 +18,11 @@ public partial class Bridge : INotifyPropertyChanged
         MessageCollection _lastmessages;
         private string _apiversion = string.Empty;
         private string _mac = string.Empty;
-        private readonly Error _bridgeNotResponding = new Error() { address = "none", description = "Bridge is not responding", type = -999 };
         private string _swversion;
         private bool _isdefault = false;
         private IPAddress _ipAddress;
         private string _name;
+        private readonly Error _bridgeNotResponding;
 
         /// <summary>
         /// Api Key to access the bridge. If the application is not autorized the api key will not be set.
@@ -97,7 +97,7 @@ public IPAddress IpAddress
             {
                 _ipAddress = value;
                 OnPropertyChanged();
-
+                _bridgeNotResponding.address = _ipAddress.ToString();
             }
         }
 
@@ -133,6 +133,7 @@ public Bridge()
             _ipAddress = IPAddress.None;
             _apiKey = string.Empty;
             _lastmessages = new MessageCollection();
+            _bridgeNotResponding = new Error() { address = $"{_ipAddress}", description = "Bridge is not responding", type = -999 };
         }
 
         /// <summary>
@@ -153,6 +154,7 @@ public Bridge(IPAddress ip, string mac, string apiversion, string swversion,stri
             _name = name;
             OnPropertyChanged("Mac");
             OnPropertyChanged("ApiVersion");
+            _bridgeNotResponding = new Error() { address = $"{_ipAddress}", description = "Bridge is not responding", type = -999 };
         }
 
         /// <summary>
diff --git a/HueLib2/Bridge/Bridge_ObjectSetter.cs b/HueLib2/Bridge/Bridge_ObjectSetter.cs
index ae0b61a1..46729012 100644
--- a/HueLib2/Bridge/Bridge_ObjectSetter.cs
+++ b/HueLib2/Bridge/Bridge_ObjectSetter.cs
@@ -274,6 +274,29 @@ public CommandResult ChangeSensorConfig(string id,SensorConfig newconfig)
             return bresult;
         }
 
+        /// <summary>
+        /// Change the sensor's state.
+        /// </summary>
+        /// <param name="id">id of the sensor</param>
+        /// <param name="newstate">New state of the sensor</param>
+        /// <returns>BridgeCommResult</returns>
+        public CommandResult ChangeSensorState(string id, SensorState newstate)
+        {
+            CommandResult bresult = new CommandResult();
+            CommResult comres = Communication.SendRequest(new Uri(BridgeUrl + $@"/sensors/{id}/state"),WebRequestType.PUT, Serializer.SerializeToJson(newstate));
+            if (comres.status == WebExceptionStatus.Success)
+            {
+                lastMessages = new MessageCollection(Serializer.DeserializeToObject<List<Message>>(comres.data));
+                bresult.Success = lastMessages.FailureCount == 0;
+                bresult.resultobject = lastMessages;
+            }
+            else
+            {
+                bresult.resultobject = comres.data;
+            }
+
+            return bresult;
+        }
 
         /// <summary>
         /// Set to null all properties that are not allow to be set at modification.
diff --git a/HueLib2/Communication/WebClientTimeout.cs b/HueLib2/Communication/WebClientTimeout.cs
index 36b10f78..ea56d9ca 100644
--- a/HueLib2/Communication/WebClientTimeout.cs
+++ b/HueLib2/Communication/WebClientTimeout.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Net;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -27,5 +30,8 @@ protected override WebRequest GetWebRequest(Uri address)
             }
             return request;
         }
+
     }
+
+
 }
diff --git a/WinHue3/Addons/CpuTempMon/CpuTemp.cs b/WinHue3/Addons/CpuTempMon/CpuTemp.cs
new file mode 100644
index 00000000..f18652f8
--- /dev/null
+++ b/WinHue3/Addons/CpuTempMon/CpuTemp.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Management;
+using OpenHardwareMonitor;
+using OpenHardwareMonitor.Hardware;
+using OpenHardwareMonitor.Collections;
+using System.Windows.Threading;
+using System.ComponentModel;
+
+namespace WinHue3
+{
+    public class CpuTemp
+    {
+        public float? temperature
+        {
+            get;
+            private set;
+        }
+
+        public string pollSensorName;
+
+        public List<ISensor> cpuSensors
+        {
+            get;
+            private set;
+        }
+
+        private readonly DispatcherTimer timer;
+        private readonly Computer comp;
+        private readonly BackgroundWorker bgwOpen;
+        private bool _notWorking = false;
+
+        public bool Working 
+        {
+            get{ return _notWorking;}
+            private set{ _notWorking = value;}
+        }
+
+        public CpuTemp(int pollingInterval)
+        {
+            
+            comp = new Computer();
+            timer = new DispatcherTimer();
+            timer.Tick += timer_Tick;
+            timer.Interval = new TimeSpan(0, 0, pollingInterval);
+            comp.CPUEnabled = true;
+
+            bgwOpen = new BackgroundWorker();
+            bgwOpen.DoWork += bgwOpen_DoWork;
+            try
+            {
+                comp.Open();
+                UpdateSensors();
+                comp.Close();
+                Working = true;
+            }
+            catch (Exception)
+            {
+                Working = false;
+            }
+            
+            pollSensorName = "CPU Package";
+        }
+
+        void bgwOpen_DoWork(object sender, DoWorkEventArgs e)
+        {
+            try
+            {
+                comp.Open();
+                timer.Start();
+                Working = true;
+            }
+            catch(Exception)
+            {
+                Working = false;
+            }
+            
+
+        }
+
+        public void Start()
+        {
+            if (!timer.IsEnabled && Working)
+            {
+                bgwOpen.RunWorkerAsync();
+            }
+        }
+
+        public void Stop()
+        {
+            if (!timer.IsEnabled || !Working) return;
+            timer.Stop();
+            comp.Close();
+        }
+
+        private void timer_Tick(object sender, EventArgs e)
+        {
+            UpdateSensors();
+            int cpuPackage = cpuSensors.FindIndex(sensor => sensor.Name == pollSensorName);
+            if (cpuPackage == -1)
+                cpuPackage = 0;
+            
+            temperature = cpuSensors[cpuPackage].Value;
+            OnTempUpdated?.Invoke(this, new CpuTempEventArgs() { currentTemp= temperature});
+        }
+
+        public event CpuTempEvent OnTempUpdated;
+        public delegate void CpuTempEvent(object sender, CpuTempEventArgs e);
+        public event CpuSensorEvent OnSensorUpdated;
+        public delegate void CpuSensorEvent(object sender, EventArgs e);
+
+        private void UpdateSensors()
+        {
+            foreach (IHardware hardware in comp.Hardware)
+            {
+                if (hardware.HardwareType != HardwareType.CPU) continue;
+
+                hardware.Update();
+
+                cpuSensors = hardware.Sensors.ToList<ISensor>();
+                cpuSensors.RemoveAll(sens => sens.SensorType != SensorType.Temperature);
+            }
+            OnSensorUpdated?.Invoke(this, new EventArgs());
+        }
+    }
+
+    public class CpuTempEventArgs : EventArgs
+    {
+        public float? currentTemp;
+    }
+}
diff --git a/WinHue3/Addons/CpuTempMon/CpuTempMonitor.cs b/WinHue3/Addons/CpuTempMon/CpuTempMonitor.cs
new file mode 100644
index 00000000..88345d8d
--- /dev/null
+++ b/WinHue3/Addons/CpuTempMon/CpuTempMonitor.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.Composition;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using HueLib2;
+
+namespace WinHue3
+{
+    
+    public class CpuTempMonitor : View
+    {
+        /// <summary>
+        /// Name of the plugin.
+        /// </summary>
+        private const string PluginName = "Cpu Temp Monitor";
+
+        /// <summary>
+        /// Description of the plugin.
+        /// </summary>
+        private const string PluginDesc = "Adjust a light or group of light depending on the temperature of your cpu.";
+
+        /// <summary>
+        /// Author of the plugin.
+        /// </summary>
+        private const string PluginAuth = "Pascal Pharand";
+
+        CpuTemp _temp;
+
+        double _gradientStartColor;
+        double _gradientStopColor;
+        double _gradientStopTemp;
+        double _gradientStartTemp;
+        string _objectId;
+        bool _objectType;
+        byte _userBri;
+        byte _userSat;
+        private bool _isrunning;
+
+        public CpuTempMonitor()
+        {
+            _temp = new CpuTemp(1);
+            _temp.OnTempUpdated += temp_OnTempUpdated;
+            LoadSettings();
+        }
+
+        private void LoadSettings()
+        {
+            _gradientStartColor = Properties.Settings.Default.CPUTemp_gradientStartColor;
+            _gradientStartTemp = Properties.Settings.Default.CPUTemp_gradientStartTemp;
+            _gradientStopColor = Properties.Settings.Default.CPUTemp_gradientStopColor;
+            _gradientStopTemp = Properties.Settings.Default.CPUTemp_gradientStopTemp;
+            _objectId = Properties.Settings.Default.CPUTemp_ObjectID;
+            _objectType = Properties.Settings.Default.CPUTemp_ObjectType;
+            _userBri = Properties.Settings.Default.CpuTemp_Brightness;
+            _userSat = Properties.Settings.Default.CPUTemp_Saturation;
+
+        }
+
+        public bool IsRunning
+        {
+            get { return _isrunning;}
+            private set { _isrunning = value; OnPropertyChanged(); }
+
+        }
+
+        /// <summary>
+        /// Required for the interface to know what the plugin name is.
+        /// </summary>
+        public string pluginName => PluginName;
+
+        /// <summary>
+        /// Required for the interface to know what the plugin description is.
+        /// </summary>
+        public string pluginDesc => PluginDesc;
+
+        /// <summary>
+        /// Required for the interface to know what the plugin author is.
+        /// </summary>
+        public string pluginAuth => PluginAuth;
+
+        /// <summary>
+        /// Required by the interface get the icon image.
+        /// </summary>
+        public Bitmap pluginIcon => Properties.Resources.cputemp;
+
+        /// <summary>
+        /// Do the plugin work.
+        /// </summary>
+        public void Start()
+        {
+            _temp.Start();
+            IsRunning = true;
+        }
+
+        /// <summary>
+        /// Stop the plugin.
+        /// </summary>
+        public void Stop()
+        {
+            _temp.Stop();
+            IsRunning = false;
+        }
+
+        /// <summary>
+        /// Show the settings form for the plugin.
+        /// </summary>
+        /// <returns>True or false or null depending on what you want to return.</returns>
+        public bool? ShowSettingsForm()
+        {
+            _temp.Stop();
+            Form_CpuTempMonitorSettings settings = new Form_CpuTempMonitorSettings(_temp) {Owner = Application.Current.MainWindow};
+            _temp.OnTempUpdated -= temp_OnTempUpdated;
+            var result = settings.ShowDialog();
+            _temp.OnTempUpdated += temp_OnTempUpdated;
+            if (result == true)
+                LoadSettings();
+            return result;
+        }
+        
+        void temp_OnTempUpdated(object sender, CpuTempEventArgs e)
+        {
+            float? actualtemp = e.currentTemp;
+            ushort hueTemp = 0;
+
+            if (actualtemp == null)
+            {
+                hueTemp = (ushort)_gradientStartColor;
+            }
+            else
+            {
+
+                double gradientRange = _gradientStartColor - _gradientStopColor;
+                double tempRange = _gradientStopTemp - _gradientStartTemp;
+
+                // Check for the order of the sliders. Is the first slider before the 2nd or the other way around.
+                if (gradientRange > 0)
+                {
+                    double multiplier = _gradientStartColor / tempRange;
+                    hueTemp = (ushort)(_gradientStartColor - (multiplier * (actualtemp - _gradientStartTemp)));
+                }
+                else
+                {
+                    hueTemp = (ushort)((_gradientStopColor * actualtemp) / _gradientStopTemp);
+                }
+
+            }
+
+            if (_objectType == true)
+            {
+                BridgeStore.SelectedBridge.SetState<Light>(new State() { hue = hueTemp, bri = _userBri, sat = _userSat, @on = true, transitiontime = 9 },_objectId);
+            }
+            else
+            {
+                BridgeStore.SelectedBridge.SetState<Group>(new HueLib2.Action() { hue = hueTemp, bri = _userBri, sat = _userSat, @on = true, transitiontime = 9 },_objectId);
+            }
+
+          }
+    }
+}
diff --git a/WinHue3/Addons/CpuTempMon/SettingsForm.xaml b/WinHue3/Addons/CpuTempMon/SettingsForm.xaml
new file mode 100644
index 00000000..58dfb689
--- /dev/null
+++ b/WinHue3/Addons/CpuTempMon/SettingsForm.xaml
@@ -0,0 +1,73 @@
+<Window
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:winHue3="clr-namespace:WinHue3"
+        x:Class="WinHue3.Form_CpuTempMonitorSettings"
+        Title="Cpu Temp Monitor Settings..." Height="386" Width="473" ResizeMode="NoResize" Loaded="Window_Loaded" WindowStartupLocation="CenterOwner" Closing="Window_Closing">
+    <Window.Resources>
+        <winHue3:BoolToOppositeBoolConverter x:Key="ReverseToBoolConverter"/>
+    </Window.Resources>
+    <Grid>
+        <ToggleButton x:Name="btnTestGradient" Content="Test Gradient" HorizontalAlignment="Left" Margin="215,320,0,0" VerticalAlignment="Top" Width="75"/>
+        <Button x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="375,320,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
+        <Button x:Name="btnSave" Content="Save" HorizontalAlignment="Left" Margin="295,320,0,0" VerticalAlignment="Top" Width="75" RenderTransformOrigin="-0.52,0.7" Click="btnSave_Click"/>
+        <GroupBox Header="Gradient Settings" HorizontalAlignment="Left" Margin="10,74,0,0" VerticalAlignment="Top" Height="142" Width="440">
+            <Grid>
+                <Label VerticalAlignment="Top" Margin="3,3,0,0" HorizontalAlignment="Left" Content="Lower Temp :" Width="78"/>
+                <Label VerticalAlignment="Top" Margin="3,65,0,0" HorizontalAlignment="Left" Content="Upper Temp :" Width="78"/>
+                <Slider x:Name="slHueGradientStart" Width="Auto" VerticalAlignment="Top" Value="25000" Margin="3,31,2,0" Maximum="65535" IsSnapToTickEnabled="True" Height="21">
+                    <Slider.Background>
+                        <LinearGradientBrush EndPoint="1.0,0.5" StartPoint="0,0.5">
+                            <GradientStop Color="#FFFF0000"/>
+                            <GradientStop Color="#FEFFFF00" Offset="0.167"/>
+                            <GradientStop Color="#FE00FF00" Offset="0.333"/>
+                            <GradientStop Color="#FE00FFFF" Offset="0.5"/>
+                            <GradientStop Color="#FE0000FF" Offset="0.667"/>
+                            <GradientStop Color="#FEFF00FF" Offset="0.833"/>
+                            <GradientStop Color="#FFFF0000" Offset="1.0"/>
+                        </LinearGradientBrush>
+                    </Slider.Background>
+                </Slider>
+                <Slider x:Name="slHueGradientStop" Width="Auto" VerticalAlignment="Top" Margin="3,96,2,0" Maximum="65535" IsSnapToTickEnabled="True" Height="21">
+                    <Slider.Background>
+                        <LinearGradientBrush EndPoint="1.0,0.5" StartPoint="0,0.5">
+                            <GradientStop Color="#FFFF0000"/>
+                            <GradientStop Color="#FEFFFF00" Offset="0.167"/>
+                            <GradientStop Color="#FE00FF00" Offset="0.333"/>
+                            <GradientStop Color="#FE00FFFF" Offset="0.5"/>
+                            <GradientStop Color="#FE0000FF" Offset="0.667"/>
+                            <GradientStop Color="#FEFF00FF" Offset="0.833"/>
+                            <GradientStop Color="#FFFF0000" Offset="1.0"/>
+                        </LinearGradientBrush>
+                    </Slider.Background>
+                </Slider>
+                <Label x:Name="lblGradientStartValue" Width="53" VerticalAlignment="Top" Margin="194,3,0,0" HorizontalAlignment="Left" Content="{Binding Value, ElementName=slHueGradientStart}"/>
+                <Label x:Name="lblGradientStopValue" Width="53" VerticalAlignment="Top" Margin="194,68,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource ReverseToBoolConverter}, ElementName=btnTestGradient}" HorizontalAlignment="Left" Content="{Binding Value, ElementName=slHueGradientStop}"/>
+
+                <xctk:DoubleUpDown x:Name="dudLowerTemp" Width="89" VerticalAlignment="Top" Value="30" Minimum="0" Margin="101,5,0,0" Maximum="{Binding Value, ElementName=dudUpperTemp}" IsEnabled="{Binding IsChecked, Converter={StaticResource ReverseToBoolConverter}, ElementName=btnTestGradient}" HorizontalAlignment="Left" ToolTip="Lower Temperature in Celsius" CultureInfo=""/>
+                <xctk:DoubleUpDown x:Name="dudUpperTemp" Width="89" VerticalAlignment="Top" Value="75" Minimum="{Binding Value, ElementName=dudLowerTemp}" Margin="101,68,0,0" Maximum="125" IsEnabled="{Binding IsChecked, Converter={StaticResource ReverseToBoolConverter}, ElementName=btnTestGradient}" HorizontalAlignment="Left" ToolTip="Upper Temperature in Celsius" CultureInfo=""/>
+
+            </Grid>
+        </GroupBox>
+        <GroupBox Header="Cpu Settings" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Height="59" Width="440">
+            <Grid Margin="0,0,0,-2">
+                <Label VerticalAlignment="Top" Margin="10,7,0,0" HorizontalAlignment="Left" Content="Cpu to monitor :"/>
+                <ComboBox x:Name="cbListCpuSensors" Width="211" VerticalAlignment="Top" Margin="131,10,0,0" HorizontalAlignment="Left" DisplayMemberPath="Name" SelectionChanged="cbListCpuSensors_SelectionChanged"/>
+                <Label x:Name="lblCpuTemp" Width="75" VerticalAlignment="Top" Margin="349,8,0,0" HorizontalAlignment="Left" Content="0.00ºC"/>
+            </Grid>
+        </GroupBox>
+        <GroupBox Header="Light or Group Settings" HorizontalAlignment="Left" Margin="10,221,0,0" VerticalAlignment="Top" Width="440" Height="94">
+            <Grid>
+                <ComboBox x:Name="cbObject" Width="305" VerticalAlignment="Top" Margin="113,10,0,0" IsEnabled="{Binding IsChecked, Converter={StaticResource ReverseToBoolConverter}, ElementName=btnTestGradient}" HorizontalAlignment="Left" DisplayMemberPath="Value.name"/>
+                <Label Content="Light or Group :" HorizontalAlignment="Left" Margin="10,6,0,0" VerticalAlignment="Top" Width="103"/>
+                <xctk:ByteUpDown x:Name="budBri" Width="89" VerticalAlignment="Top" Value="254" Minimum="{Binding Value, ElementName=dudLowerTemp}" Margin="113,42,0,0" Maximum="254" IsEnabled="{Binding IsChecked, Converter={StaticResource ReverseToBoolConverter}, ElementName=btnTestGradient}" HorizontalAlignment="Left" ToolTip="Upper Temperature in Celsius" CultureInfo=""/>
+                <Label Content="Brightness :" HorizontalAlignment="Left" Margin="10,39,0,0" VerticalAlignment="Top" Width="98"/>
+                <Label Content="Saturation :" HorizontalAlignment="Left" Margin="207,39,0,0" VerticalAlignment="Top" Width="76"/>
+                <xctk:ByteUpDown x:Name="budSat" Width="102" VerticalAlignment="Top" Value="254" Minimum="{Binding Value, ElementName=dudLowerTemp}" Margin="316,42,0,0" Maximum="254" IsEnabled="{Binding IsChecked, Converter={StaticResource ReverseToBoolConverter}, ElementName=btnTestGradient}" HorizontalAlignment="Left" ToolTip="Upper Temperature in Celsius" CultureInfo=""/>
+
+            </Grid>
+        </GroupBox>
+
+    </Grid>
+</Window>
diff --git a/WinHue3/Addons/CpuTempMon/SettingsForm.xaml.cs b/WinHue3/Addons/CpuTempMon/SettingsForm.xaml.cs
new file mode 100644
index 00000000..89e6c59e
--- /dev/null
+++ b/WinHue3/Addons/CpuTempMon/SettingsForm.xaml.cs
@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.Composition;
+using System.Drawing;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Threading;
+using HueLib2;
+using OpenHardwareMonitor.Hardware;
+
+using Action = System.Action;
+
+namespace WinHue3
+{
+    /// <summary>
+    /// Logique d'interaction pour Window1.xaml
+    /// </summary>
+    public partial class Form_CpuTempMonitorSettings : Window
+    {
+
+        /// <summary>
+        /// The Host provides a way to request information on objects present in the bridge.
+        /// </summary
+    
+
+        //*********************** Local Plugin Variable *********************
+
+        private CpuTemp Temp;
+
+        double gradientStartColor;
+        double gradientStopColor;
+        double gradientStartTemp;
+        double gradientStopTemp;
+
+        public Form_CpuTempMonitorSettings(CpuTemp temp)
+        {
+            InitializeComponent();
+            Temp = temp;
+            temp.OnTempUpdated += temp_OnTempUpdated;
+            Temp.Start();
+
+            if (Dispatcher.CheckAccess())
+            {
+                cbListCpuSensors.Items.Clear();
+                foreach (ISensor sensor in temp.cpuSensors)
+                {
+                    cbListCpuSensors.Items.Add(sensor);
+                    if (sensor.Name.Contains("Package"))
+                        cbListCpuSensors.SelectedIndex = cbListCpuSensors.Items.Count - 1;
+                }
+            }
+            else
+            {
+                Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    cbListCpuSensors.Items.Clear();
+                    foreach (ISensor sensor in temp.cpuSensors)
+                    {
+                        cbListCpuSensors.Items.Add(sensor);
+                        if (sensor.Name.Contains("Package"))
+                            cbListCpuSensors.SelectedIndex = cbListCpuSensors.Items.Count - 1;
+                    }
+
+                }));
+
+            }
+        }
+
+        private void cbListCpuSensors_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            Dispatcher.Invoke(() => { if (cbListCpuSensors.SelectedValue != null) { Temp.pollSensorName = cbListCpuSensors.SelectedValue.ToString(); } });
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            int id = -1;
+
+            slHueGradientStart.Value = Properties.Settings.Default.CPUTemp_gradientStartColor;
+            slHueGradientStop.Value = Properties.Settings.Default.CPUTemp_gradientStopColor;
+            dudLowerTemp.Value = Properties.Settings.Default.CPUTemp_gradientStartTemp;
+            dudUpperTemp.Value = Properties.Settings.Default.CPUTemp_gradientStopTemp;
+            budBri.Value = Properties.Settings.Default.CpuTemp_Brightness;
+            budSat.Value = Properties.Settings.Default.CPUTemp_Saturation;
+
+            CommandResult bresult = BridgeStore.SelectedBridge.GetListObjects<Light>();
+            CommandResult bresult2 = BridgeStore.SelectedBridge.GetListObjects<Group>();
+            if (bresult.Success && bresult2.Success)
+            {
+                Dictionary<string, Light> lightlist = (Dictionary<string, Light>)bresult.resultobject;
+                Dictionary<string, Group> grouplist = (Dictionary<string, Group>)bresult2.resultobject;
+
+                foreach (KeyValuePair<string, Light> kvp in lightlist)
+                {
+                    cbObject.Items.Add(kvp);
+                    if (Properties.Settings.Default.CPUTemp_ObjectType)
+                    {
+                        if (kvp.Key == Properties.Settings.Default.CPUTemp_ObjectID)
+                            id = cbObject.Items.Count - 1;
+                    }
+                }
+
+                foreach (KeyValuePair<string, Group> kvp in grouplist)
+                {
+                    cbObject.Items.Add(kvp);
+                    if (!Properties.Settings.Default.CPUTemp_ObjectType)
+                    {
+                        if (kvp.Key == Properties.Settings.Default.CPUTemp_ObjectID)
+                            id = cbObject.Items.Count - 1;
+                    }
+                }
+
+                if (cbObject.Items.Count > 0)
+                {
+                    cbObject.SelectedIndex = 0;
+                }
+
+                if (id > -1)
+                    cbObject.SelectedIndex = id;
+            }        
+
+        }
+
+
+
+        private void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+
+        void temp_OnTempUpdated(object sender, CpuTempEventArgs e)
+        {
+            float? actualtemp = e.currentTemp;
+            ushort hueTemp = 0;
+
+            lblCpuTemp.Content = $"{Temp.temperature:0.0}ºC";
+            if (!(bool)btnTestGradient.IsChecked) return;
+            gradientStartColor = slHueGradientStart.Value;
+            gradientStopColor = slHueGradientStop.Value;
+            gradientStopTemp = (double)dudUpperTemp.Value;
+            gradientStartTemp = (double)dudLowerTemp.Value;
+
+            if ((bool)btnTestGradient.IsChecked)
+            {
+                if (actualtemp == null)
+                {
+                    hueTemp = (ushort)gradientStartColor;
+                }
+                else
+                {
+
+                    double gradientRange = gradientStartColor - gradientStopColor;
+                    double tempRange = gradientStopTemp - gradientStartTemp;
+
+
+                    if (gradientRange > 0)
+                    {
+                        double multiplier = gradientStartColor / tempRange;
+                        hueTemp = (ushort)(gradientStartColor - (multiplier * (actualtemp - gradientStartTemp)));
+                    }
+                    else
+                    {
+                        hueTemp = (ushort)((gradientStopColor * actualtemp) / gradientStopTemp);
+                    }
+
+                }
+
+                
+
+                if (cbObject.SelectedItem is KeyValuePair<string, Light>)
+                {
+                    BridgeStore.SelectedBridge.SetState<Light>(new State() { hue = hueTemp, bri = 255, sat = 255, @on = true, transitiontime = 9 }, ((KeyValuePair<string, Light>)cbObject.SelectedItem).Key);
+                }
+                else
+                {
+                    BridgeStore.SelectedBridge.SetState<Group>(new HueLib2.Action() { hue = hueTemp, bri = 255, sat = 255, @on = true, transitiontime = 9 }, ((KeyValuePair<string, Group>)cbObject.SelectedItem).Key);
+                }
+
+            }
+        }
+
+        private void Window_Closing(object sender, CancelEventArgs e)
+        {
+            Temp.OnTempUpdated -= temp_OnTempUpdated;
+            Temp?.Stop();
+        }
+
+        private void btnSave_Click(object sender, RoutedEventArgs e)
+        {
+            Properties.Settings.Default.CPUTemp_SensorName = ((ISensor) cbListCpuSensors.SelectedItem).Name;
+            Properties.Settings.Default.CPUTemp_gradientStartColor = slHueGradientStart.Value;
+            Properties.Settings.Default.CPUTemp_gradientStopColor = slHueGradientStop.Value;
+            Properties.Settings.Default.CPUTemp_Saturation = (byte)budSat.Value;
+            Properties.Settings.Default.CpuTemp_Brightness = (byte)budBri.Value;
+
+            if (dudLowerTemp.Value != null)
+                Properties.Settings.Default.CPUTemp_gradientStartTemp = (double)dudLowerTemp.Value;
+            if (dudUpperTemp.Value != null)
+                Properties.Settings.Default.CPUTemp_gradientStopTemp = (double)dudUpperTemp.Value;
+
+            if (cbObject.SelectedItem is KeyValuePair<string, Light>)
+            {
+                Properties.Settings.Default.CPUTemp_ObjectType = true;
+                Properties.Settings.Default.CPUTemp_ObjectID = ((KeyValuePair<string, Light>) cbObject.SelectedItem).Key;
+            }
+            else
+            {
+                Properties.Settings.Default.CPUTemp_ObjectType = false;
+                Properties.Settings.Default.CPUTemp_ObjectID = ((KeyValuePair<string, Group>) cbObject.SelectedItem).Key;
+            }
+
+            Properties.Settings.Default.Save();
+            DialogResult = true;
+            Close();
+        }
+
+    }
+}
diff --git a/WinHue3/Addons/RssFeedMonitor/Condition.cs b/WinHue3/Addons/RssFeedMonitor/Condition.cs
new file mode 100644
index 00000000..a07d799e
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/Condition.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Runtime.Serialization;
+using System.Windows;
+using System.Collections.Generic;
+using HueLib2;
+
+namespace WinHue3
+{
+    [DataContract,Serializable]
+    public class Alert
+    {
+        [DataMember]
+        public string Name { get; set; }
+
+        [DataMember]
+        public string Description { get; set; }
+
+        [DataMember]
+        public string Url { get; set; }
+
+        [DataMember]
+        public List<Criteria> Criterias { get; set; }
+
+        [DataMember]
+        public Body Action { get; set; }
+
+        [DataMember]
+        public bool Enabled { get; set; }
+    
+        [DataMember]
+        public List<string> lights { get; set; }
+
+        [DataMember]
+        public bool Triggered { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/WinHue3/Addons/RssFeedMonitor/Criteria.cs b/WinHue3/Addons/RssFeedMonitor/Criteria.cs
new file mode 100644
index 00000000..ebdcde46
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/Criteria.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace WinHue3
+{
+    [DataContract,Serializable]
+    public class Criteria
+    {
+        [DataMember]
+        public string RSSElement { get; set; }
+        [DataMember]
+        public string Condition { get; set; }
+        [DataMember]
+        public string UserCondition { get; set; }
+
+        public override string ToString()
+        {
+            return $"{RSSElement} {Condition} {UserCondition}";
+        }
+    }
+}
\ No newline at end of file
diff --git a/WinHue3/Addons/RssFeedMonitor/Form_ActionPicker.xaml b/WinHue3/Addons/RssFeedMonitor/Form_ActionPicker.xaml
new file mode 100644
index 00000000..f16a18e7
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/Form_ActionPicker.xaml
@@ -0,0 +1,81 @@
+<Window x:Class="WinHue3.Form_ActionPicker"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        Title="Selection an action..." Height="382.881" Width="595.424" Loaded="Window_Loaded" WindowStartupLocation="CenterOwner">
+    <Grid>
+        <GroupBox x:Name="groupBox1" Header="STEP 4 : Set the action upon the conditions" HorizontalAlignment="Left" Margin="161,0,0,0" VerticalAlignment="Top" Height="312" Width="409">
+            <Grid HorizontalAlignment="Left" Width="448" Margin="0,0,-51,0" Height="262" VerticalAlignment="Top">
+                <Grid Margin="0,0,3,-33" Height="295" VerticalAlignment="Top">
+                    <Label Content="Hue / Color" HorizontalAlignment="Center" Margin="10,0,345,157" Width="90"/>
+                    <Slider x:Name="slHue" IsEnabled="{Binding IsChecked, ElementName=chbHue}" Height="175" VerticalAlignment="Top" Maximum="65535" Margin="33,31,391,0" Width="Auto" IsSnapToTickEnabled="True" Orientation="Vertical" SmallChange="1" SnapsToDevicePixels="True" AutoToolTipPlacement="TopLeft" ValueChanged="slHue_OnValueChanged">
+                        <Slider.Background>
+                            <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0" >
+                                <GradientStop Color="#FFFF0000" />
+                                <GradientStop Color="#FEFFFF00" Offset="0.167" />
+                                <GradientStop Color="#FE00FF00" Offset="0.333" />
+                                <GradientStop Color="#FE00FFFF" Offset="0.5" />
+                                <GradientStop Color="#FE0000FF" Offset="0.667" />
+                                <GradientStop Color="#FEFF00FF" Offset="0.833" />
+                                <GradientStop Color="#FFFF0000" Offset="1.0" />
+                            </LinearGradientBrush>
+                        </Slider.Background>
+                        <Slider.Style>
+                            <Style/>
+                        </Slider.Style>
+                    </Slider>
+                    <Label Content="Brightness" HorizontalAlignment="Center" Margin="80,0,299,157" Width="66"/>
+                    <Slider x:Name="slBri" Height="175" VerticalAlignment="Top" Maximum="254" Margin="103,31,320,0" Width="Auto" IsSnapToTickEnabled="True" IsEnabled="{Binding IsChecked, ElementName=chbBri}" SmallChange="1" Orientation="Vertical" AutoToolTipPlacement="TopLeft">
+                        <Slider.Background>
+                            <LinearGradientBrush EndPoint="0.5,0" StartPoint="0.5,1">
+                                <GradientStop Color="White" Offset="1"/>
+                                <GradientStop Color="Black" Offset="0"/>
+                            </LinearGradientBrush>
+                        </Slider.Background>
+                    </Slider>
+                    <Label Content="Color Temp." HorizontalAlignment="Center"  Width="83" Margin="147,0,215,157"/>
+                    <Slider x:Name="slCT" Height="175" VerticalAlignment="Top" Maximum="500" Margin="178,31,246,0" Width="Auto" Minimum="153" IsSnapToTickEnabled="True" IsEnabled="{Binding IsChecked, ElementName=chbCT}" SmallChange="1" Orientation="Vertical" AutoToolTipPlacement="TopLeft">
+                        <Slider.Background>
+                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                <GradientStop Color="#FFFF8912" Offset="0"/>
+                                <GradientStop Color="#FFFFF9FD" Offset="1"/>
+                            </LinearGradientBrush>
+                        </Slider.Background>
+                    </Slider>
+                    <Label Content="Saturation" HorizontalAlignment="Center" Margin="228,0,151,157" Width="66"/>
+                    <Slider x:Name="slSAT" Height="175" VerticalAlignment="Top" Maximum="254" Minimum="0" Margin="250,31,173,0" IsSnapToTickEnabled="True" IsEnabled="{Binding IsChecked, ElementName=chbSAT}" SmallChange="1" Orientation="Vertical" AutoToolTipPlacement="TopLeft">
+                        <Slider.Background>
+                            <LinearGradientBrush  EndPoint="0.5,0" StartPoint="0.5,1">
+                                <GradientStop Color="White" x:Name="slSATStartGradient"/>
+                                <GradientStop Color="Red" Offset="1" x:Name="slSATEndGradient"/>
+                            </LinearGradientBrush>
+                        </Slider.Background>
+                    </Slider>
+                    <Label Content="XY Color Space" HorizontalAlignment="Center" Margin="305,0,48,237" Width="92" RenderTransformOrigin="0.507,0"/>
+                    <Slider x:Name="slX" Maximum="1" Minimum="0" Margin="315,31,103,89" IsSnapToTickEnabled="True"  TickFrequency="0.001" SmallChange="0.001" Orientation="Vertical" AutoToolTipPlacement="TopLeft"/>
+                    <Slider x:Name="slY" Maximum="1" Minimum="0" Margin="365,31,56,89" IsSnapToTickEnabled="True"  TickFrequency="0.001" SmallChange="0.001" Orientation="Vertical" AutoToolTipPlacement="TopLeft"/>
+                    <CheckBox x:Name="chbHue" HorizontalAlignment="Left" Margin="35,212,0,0" VerticalAlignment="Top" IsEnabled="{Binding IsChecked, ElementName=chbOn}" ToolTip="Hue Value. Cannot be used at the same time as Color Temp and XY Colorspace." Checked="ChbHue_OnChecked"/>
+                    <CheckBox x:Name="chbBri" HorizontalAlignment="Left" Margin="106,212,0,0" VerticalAlignment="Top" IsEnabled="{Binding IsChecked, ElementName=chbOn}" ToolTip="Brightness."/>
+                    <CheckBox x:Name="chbCT" HorizontalAlignment="Left" Margin="181,212,0,0" VerticalAlignment="Top" IsEnabled="{Binding IsChecked, ElementName=chbOn}" ToolTip="Color Temperature. Cannot be used at the same time as Hue and XY Colorspace." Checked="ChbCT_OnChecked"/>
+                    <CheckBox x:Name="chbSAT" HorizontalAlignment="Left" Margin="252,212,0,0" VerticalAlignment="Top" IsEnabled="{Binding IsChecked, ElementName=chbOn}" ToolTip="Saturation."/>
+                    <CheckBox x:Name="chbX" HorizontalAlignment="Left" Margin="342,212,0,0" VerticalAlignment="Top" IsEnabled="{Binding IsChecked, ElementName=chbOn}"  ToolTip="X Colorspace. Cannot be used at the same time as Hue and Color Temperature. Muse be used with Y Colorspace." Checked="ChbX_OnChecked"/>
+                    <Label x:Name="lblTT" Content="Transition Time : none" HorizontalAlignment="Center" Margin="20,224,200,20" Width="225" HorizontalContentAlignment="Center"/>
+                    <Slider x:Name="slTT" Maximum="65535" Minimum="-1" Margin="56,244,56,27" IsSnapToTickEnabled="True" IsEnabled="{Binding IsChecked, ElementName=chbTT}" SmallChange="1" AutoToolTipPlacement="TopLeft" ValueChanged="SlTT_OnValueChanged" ToolTip="Use the left and right key on the keyboard for more precise movement." SnapsToDevicePixels="True"/>
+                    <CheckBox x:Name="chbTT" Content="" HorizontalAlignment="Left" Margin="21,248,0,0" VerticalAlignment="Top" Width="22"/>
+                    <CheckBox x:Name="chbOn" Content="ON" HorizontalAlignment="Left" Margin="20,273,0,0" VerticalAlignment="Top" IsChecked="True"/>
+                    <ComboBox x:Name="cbAlert" HorizontalAlignment="Left" Margin="250,268,0,0" VerticalAlignment="Top" Width="137" SelectedIndex="0" ToolTip="Selecting an alert will flash the light." IsEnabled="{Binding IsChecked, ElementName=chbOn}">
+                        <ComboBoxItem x:Name="cbiNoAlert" Content="No Alert"/>
+                        <ComboBoxItem x:Name="cbiShortAlert" Content="Short Alert"/>
+                        <ComboBoxItem x:Name="cbiLongAlert" Content="Long Alert"/>
+                    </ComboBox>
+                </Grid>
+            </Grid>
+        </GroupBox>
+        <ListBox x:Name="lbLights" HorizontalAlignment="Left" Height="302" Margin="10,10,0,0" VerticalAlignment="Top" Width="146" DisplayMemberPath="Value.name" SelectionMode="Multiple"/>
+        <Button x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="494,317,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
+        <Button x:Name="btnDone" Content="Done" HorizontalAlignment="Left" Margin="414,317,0,0" VerticalAlignment="Top" Width="75" Click="btnDone_Click"/>
+
+    </Grid>
+</Window>
diff --git a/WinHue3/Addons/RssFeedMonitor/Form_ActionPicker.xaml.cs b/WinHue3/Addons/RssFeedMonitor/Form_ActionPicker.xaml.cs
new file mode 100644
index 00000000..d2e45cd0
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/Form_ActionPicker.xaml.cs
@@ -0,0 +1,276 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using HueLib2;
+using Color = System.Drawing.Color;
+
+namespace WinHue3
+{
+    /// <summary>
+    /// Interaction logic for Form_ActionPicker.xaml
+    /// </summary>
+    public partial class Form_ActionPicker : Window
+    {
+
+        private List<string> _listselectedLights;
+        private Body _action;
+
+        public Form_ActionPicker()
+        {
+            InitializeComponent();
+            _action = null;
+            _listselectedLights = null;
+        }
+
+        public Form_ActionPicker(Body action, List<string> listlights )
+        {
+            InitializeComponent();
+            _action = action;
+            _listselectedLights = listlights;
+        }
+
+
+        private void slHue_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            if (slSATEndGradient == null) return;
+            double val = slHue.Value / 273.06;
+            Color color = new HSLColor(val, 240, 120);
+            slSATEndGradient.Color = System.Windows.Media.Color.FromRgb(color.R, color.G, color.B);
+        }
+
+        private void ChbHue_OnChecked(object sender, RoutedEventArgs e)
+        {
+            chbCT.IsChecked = false;
+            chbX.IsChecked = false;
+        }
+
+        private void ChbCT_OnChecked(object sender, RoutedEventArgs e)
+        {
+            chbHue.IsChecked = false;
+            chbX.IsChecked = false;
+        }
+
+        private void ChbX_OnChecked(object sender, RoutedEventArgs e)
+        {
+            chbHue.IsChecked = false;
+            chbCT.IsChecked = false;
+
+        }
+
+        private void SlTT_OnValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            if (slTT.Value >= 0)
+            {
+                int time = (int)(slTT.Value * 100);
+                if (time == 0)
+                {
+                    lblTT.Content = "Transition Time : Instantaneous";
+                }
+                else if (time > 0 && time < 1000)
+                {
+                    lblTT.Content = $"Transition Time : {(double)time:0.##} ms";
+                }
+                else if (time >= 1000 && time < 60000)
+                {
+                    lblTT.Content = $"Transition Time : {((double)time / 1000):0.##} seconds";
+                }
+                else if (time >= 60000)
+                {
+                    lblTT.Content = $"Transition Time : {((double)time / 60000):0.##} minutes";
+                }
+
+            }
+            else
+            {
+                if (lblTT != null)
+                    lblTT.Content = "Transition Time : none";
+            }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            CommandResult bresult = BridgeStore.SelectedBridge.GetListObjects<Light>();
+            if (bresult.Success)
+            {
+                Dictionary<string, Light> listlights = (Dictionary<string, Light>) bresult.resultobject;
+
+                foreach (KeyValuePair<string, Light> kvp in listlights)
+                {
+                    lbLights.Items.Add(kvp);
+                }
+
+                if (_action == null) return;
+
+                if (_action.hue != null)
+                {
+                    chbHue.IsChecked = true;
+                    slHue.Value = (double) _action.hue;
+                }
+
+                if (_action.bri != null)
+                {
+                    chbBri.IsChecked = true;
+                    slBri.Value = (double) _action.bri;
+                }
+
+                if (_action.sat != null)
+                {
+                    chbSAT.IsChecked = true;
+                    slSAT.Value = (double) _action.sat;
+                }
+
+                if (_action.ct != null)
+                {
+                    chbCT.IsChecked = true;
+                    slCT.Value = (double) _action.ct;
+                }
+
+                if (_action.xy != null)
+                {
+                    chbX.IsChecked = true;
+                    //   slX.Value = (double) _action.xy[0];
+                    //   slY.Value = (double) _action.xy[1];
+                }
+
+                if (_action.transitiontime != null)
+                {
+                    chbTT.IsChecked = true;
+                    slTT.Value = (double) _action.transitiontime;
+                }
+
+                if (_action.alert != null)
+                {
+                    switch (_action.alert)
+                    {
+                        case "none":
+                            cbAlert.SelectedIndex = 0;
+                            break;
+                        case "select":
+                            cbAlert.SelectedItem = 1;
+                            break;
+                        case "lselect":
+                            cbAlert.SelectedItem = 2;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                else
+                {
+                    cbAlert.SelectedIndex = 0;
+                }
+
+                if (_listselectedLights == null) return;
+
+                foreach (
+                    KeyValuePair<byte, Light> kvp in
+                    lbLights.Items.Cast<KeyValuePair<byte, Light>>()
+                        .Where(kvp => _listselectedLights.Contains(kvp.Key.ToString())))
+                {
+                    lbLights.SelectedItems.Add(kvp);
+                }
+            }
+        }
+
+        private void btnDone_Click(object sender, RoutedEventArgs e)
+        {
+
+            if ((!(bool)chbHue.IsChecked && !(bool)chbBri.IsChecked && !(bool)chbSAT.IsChecked && !(bool)chbCT.IsChecked && !(bool)chbX.IsChecked && cbAlert.SelectedIndex == 0) && (bool)chbOn.IsChecked)
+            {
+                MessageBox.Show("Please check at least one action to do when the conditions are met.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            if (lbLights.SelectedItems.Count == 0)
+            {
+                MessageBox.Show("Please check at least one light on which to apply the action when conditions are met.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            _action = new Body();
+            _listselectedLights = new List<string>();
+
+            if ((bool)chbHue.IsChecked)
+                _action.hue = (byte)slHue.Value;
+
+            if ((bool)chbBri.IsChecked)
+                _action.bri = (byte)slBri.Value;
+
+            if ((bool)chbCT.IsChecked)
+                _action.ct = (ushort)slCT.Value;
+
+            if ((bool)chbSAT.IsChecked)
+                _action.sat = (byte)slSAT.Value;
+
+            if ((bool) chbX.IsChecked)
+            {
+                _action.xy = new XY();
+                _action.xy.x = (decimal) slX.Value;
+                _action.xy.y = (decimal) slY.Value;
+            }
+            if ((bool)chbTT.IsChecked)
+                _action.transitiontime = (ushort)slTT.Value;
+
+            _action.on = chbOn.IsChecked;
+
+            switch (cbAlert.SelectedIndex)
+            {
+                case 0:
+                    _action.alert = null;
+                    break;
+                case 1:
+                    _action.alert = "select";
+                    break;
+                case 2:
+                    _action.alert = "lselect";
+                    break;
+                default:
+                    _action.alert = null;
+                    break;
+            }
+
+            
+            foreach (KeyValuePair<byte, Light> kvp in lbLights.SelectedItems)
+            {
+                _listselectedLights.Add(kvp.Key.ToString());
+            }
+
+            DialogResult = true;
+            Close();
+
+        }
+
+        public List<string> GetSelectedLights()
+        {
+            return _listselectedLights;
+        }
+
+        public Body GetAction()
+        {
+            return _action;
+        }
+
+        public void ClearAction()
+        {
+            _listselectedLights = new List<string>();
+            _action = new Body();
+        }
+
+        private void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+    }
+}
diff --git a/WinHue3/Addons/RssFeedMonitor/Form_AlertCreator.xaml b/WinHue3/Addons/RssFeedMonitor/Form_AlertCreator.xaml
new file mode 100644
index 00000000..6b77cacf
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/Form_AlertCreator.xaml
@@ -0,0 +1,55 @@
+<Window
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        x:Class="WinHue3.Form_AlertCreator"
+        mc:Ignorable="d"
+        Title="Create an alert..." Height="410.689" Width="428.631" WindowStartupLocation="CenterOwner" Loaded="Window_Loaded">
+    <Grid>
+
+        <Button x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="330,346,0,0" VerticalAlignment="Top" Width="75" Click="btnCancel_Click"/>
+        <Button x:Name="btnSave" Content="Save" HorizontalAlignment="Left" Margin="250,346,0,0" VerticalAlignment="Top" Width="75" Click="btnSave_Click"/>
+        <GroupBox x:Name="gbStep1" Header="STEP 2 : Set the url to the RSS Feed" HorizontalAlignment="Left" VerticalAlignment="Top" Height="53" Width="401" Margin="4,84,0,0">
+            <Grid>
+                <TextBox x:Name="tbUrl" HorizontalAlignment="Left" Height="23" Margin="10,3,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="322"/>
+                <Button x:Name="btnCheck" Content="Check" HorizontalAlignment="Left" Margin="337,3,0,0" VerticalAlignment="Top" Width="45" Click="btnCheck_Click" Height="23"/>
+
+            </Grid>
+        </GroupBox>
+        <GroupBox x:Name="groupBox" Header="STEP 3 : Choose your criteria(s)" HorizontalAlignment="Left" Margin="4,137,0,0" VerticalAlignment="Top" Height="148" Width="401">
+            <Grid Margin="0,0,0,1">
+                <ComboBox x:Name="cbRssElements" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="232" SelectedIndex="0" SelectionChanged="cbRssElements_SelectionChanged" >
+                    <ComboBoxItem x:Name="cbiTitle" Content="Title"/>
+                    <ComboBoxItem x:Name="cbiDesc" Content="Description / Summary"/>
+                    <ComboBoxItem x:Name="cbiCat" Content="Category"/>
+                    <ComboBoxItem x:Name="cbiPubDate" Content="Publication Date"/>
+                </ComboBox>
+                <ComboBox x:Name="cbCondition" HorizontalAlignment="Left" Margin="247,10,0,0" VerticalAlignment="Top" Width="137" SelectedIndex="0">
+                    <ComboBoxItem x:Name="cbiContains" Content="Contains"/>
+                    <ComboBoxItem x:Name="cbiEquals" Content="Equals"/>
+                    <ComboBoxItem x:Name="cbiGreater" Content="Greater Than" Visibility="Collapsed"/>
+                    <ComboBoxItem x:Name="cbiLower" Content="Lower Then" Visibility="Collapsed"/>
+                </ComboBox>
+                <TextBox x:Name="tbUserCondition" HorizontalAlignment="Left" Height="23" Margin="10,37,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="232" ToolTip="Case is not sensitive."/>
+                <Button x:Name="btnAddCondition" Content="Add" HorizontalAlignment="Left" Margin="247,37,0,0" VerticalAlignment="Top" Width="137" IsEnabled="false" Click="btnAddCondition_Click" Height="23" ToolTip="Multiple alert are linked by the AND operator."/>
+                <ListBox x:Name="lbConditions" HorizontalAlignment="Left" Height="57" Margin="10,65,0,0" VerticalAlignment="Top" Width="374" KeyDown="lbConditions_KeyDown" ToolTip="Press Delete on the keyboard to remove a trigger." ScrollViewer.VerticalScrollBarVisibility="Visible"/>
+
+            </Grid>
+        </GroupBox>
+        <Button x:Name="btnClear" Content="Clear" HorizontalAlignment="Left" Margin="170,346,0,0" VerticalAlignment="Top" Width="75" Click="btnClear_Click"/>
+        <CheckBox x:Name="chbEnabled" Content="Enable" HorizontalAlignment="Left" Margin="10,346,0,0" VerticalAlignment="Top" IsChecked="True"/>
+        <GroupBox x:Name="groupBox2" Header="STEP 1 : Name your Alert" HorizontalAlignment="Left" Margin="4,0,0,0" VerticalAlignment="Top" Height="79" Width="401">
+            <Grid>
+                <Label x:Name="label" Content="Name : " HorizontalAlignment="Left" Margin="10,0,0,0" VerticalAlignment="Top"/>
+                <TextBox x:Name="tbName" HorizontalAlignment="Left" Height="23" Margin="66,4,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="313"/>
+                <Label x:Name="label1" Content="Descr :" HorizontalAlignment="Left" Margin="10,26,0,0" VerticalAlignment="Top"/>
+                <TextBox x:Name="tbDescription" HorizontalAlignment="Left" Height="23" Margin="66,30,0,0" TextWrapping="Wrap" Text="" VerticalAlignment="Top" Width="313"/>
+            </Grid>
+        </GroupBox>
+        <GroupBox x:Name="groupBox1" Header="STEP 4 : Select what to do when your criterias are met" HorizontalAlignment="Left" Margin="4,285,0,0" VerticalAlignment="Top" Height="56" Width="401">
+            <Button x:Name="btnSelectAction" Content="Select Action" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" Width="373" Click="btnSelectAction_Click"/>
+        </GroupBox>
+
+    </Grid>
+</Window>
diff --git a/WinHue3/Addons/RssFeedMonitor/Form_AlertCreator.xaml.cs b/WinHue3/Addons/RssFeedMonitor/Form_AlertCreator.xaml.cs
new file mode 100644
index 00000000..56fda62c
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/Form_AlertCreator.xaml.cs
@@ -0,0 +1,230 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.ServiceModel.Syndication;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Xml;
+using HueLib2;
+
+namespace WinHue3
+{
+    /// <summary>
+    /// Interaction logic for Form_AlertCreator.xaml
+    /// </summary>
+    public partial class Form_AlertCreator : Window
+    {
+
+        private bool _actionSet;
+        private Form_ActionPicker fap;
+        private string _oldName;
+
+        public Form_AlertCreator()
+        {
+            InitializeComponent();
+            fap = new Form_ActionPicker();
+            _oldName = null;
+        }
+
+        public Form_AlertCreator(Alert alert)
+        {
+            InitializeComponent();
+            tbDescription.Text = alert.Description;
+            tbName.Text = alert.Name;
+            tbUrl.Text = alert.Url;
+            chbEnabled.IsChecked = alert.Enabled;
+            foreach (Criteria c in alert.Criterias)
+            {
+                lbConditions.Items.Add(c);
+            }
+            fap = new Form_ActionPicker(alert.Action, alert.lights);
+            chbEnabled.IsChecked = alert.Enabled;
+            _oldName = alert.Name;
+        }
+
+        private void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+
+
+        private void btnCheck_Click(object sender, RoutedEventArgs e)
+        {
+            Uri uriResult;
+            bool result = Uri.TryCreate(tbUrl.Text, UriKind.Absolute, out uriResult) && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps);
+            if (!result) return;
+
+            try
+            {
+                XmlReader reader = XmlReader.Create(uriResult.ToString());
+                SyndicationFeed obj = SyndicationFeed.Load(reader);
+                btnAddCondition.IsEnabled = true;
+            }
+            catch (Exception)
+            {
+                MessageBox.Show("The entered url does not seem to be valid.\r\n Please enter a valid RSS feed url.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
+        private void btnAddCondition_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(tbUserCondition.Text) || tbUserCondition.Text == string.Empty)
+            {
+                MessageBox.Show("Please enter a word in user alert box.", "Error", MessageBoxButton.OK,MessageBoxImage.Error);
+                return;
+                
+            }
+
+            if (cbRssElements.SelectedItem == null)
+            {
+                MessageBox.Show("Please select an rss element to monitor.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+            lbConditions.Items.Add(new Criteria
+            {
+                RSSElement = cbRssElements.Text,
+                Condition = cbCondition.Text,
+                UserCondition = tbUserCondition.Text
+            });
+            ((ComboBoxItem)cbRssElements.SelectedItem).Visibility = Visibility.Collapsed;
+            ClearCondition();
+        }
+
+        private void ClearCondition()
+        {
+            cbCondition.SelectedIndex = 0;
+            tbUserCondition.Text = string.Empty;
+            cbRssElements.SelectedIndex = -1;
+            cbRssElements.SelectedItem = null;
+            cbRssElements.Text = "";
+          
+        }
+
+        private void btnClear_Click(object sender, RoutedEventArgs e)
+        {
+            tbUrl.Text = string.Empty;
+            btnCheck.IsEnabled = true;
+            lbConditions.Items.Clear();
+            ClearCondition();
+            _actionSet = false;
+        }
+
+        private void lbConditions_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key != Key.Delete) return;
+            if (lbConditions.SelectedItem == null) return;
+
+            switch (((Criteria)lbConditions.SelectedItem).RSSElement)
+            {
+                case "Title":
+                    cbiTitle.Visibility = Visibility.Visible;
+                    break;
+                case "Description":
+                    cbiEquals.Visibility = Visibility.Visible;
+                    break;
+                case "Category":
+                    cbiCat.Visibility = Visibility.Visible;
+                    break;
+                case "Publication Date":
+                    cbiPubDate.Visibility = Visibility.Visible;
+                    break;
+            }
+
+            lbConditions.Items.Remove(lbConditions.SelectedItem);
+        }
+
+        private void btnSave_Click(object sender, RoutedEventArgs e)
+        {
+            if (string.IsNullOrWhiteSpace(tbName.Text) || string.IsNullOrEmpty(tbName.Name))
+            {
+                MessageBox.Show("Please enter a name for the alert to check.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            if (lbConditions.Items.Count == 0)
+            {
+                MessageBox.Show("Please enter at least one alert to check.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+
+            if (!_actionSet)
+            {
+                MessageBox.Show("Please select the action desired upon criteria match.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+
+            }
+
+            Alert newCondition = new Alert
+            {
+                Name = tbName.Text,
+                Description = tbDescription.Text,
+                Enabled = (bool)chbEnabled.IsChecked,
+                Action = fap.GetAction(),
+                Criterias = new List<Criteria>(),
+                lights = fap.GetSelectedLights(),
+                Url = tbUrl.Text
+            };
+
+            foreach (Criteria t in lbConditions.Items)
+            {
+                newCondition.Criterias.Add(t);    
+            }
+
+            if (_oldName != null)
+            {
+                RssFeedAlertHandler.DeleteFeedAlert(_oldName);
+            }
+
+            if (RssFeedAlertHandler.SaveFeedAlert(newCondition))
+            {
+                DialogResult = true;
+                Close();
+            }
+            else
+            {
+                MessageBox.Show("Therer was an error while saving the current Rss Feed Alert.", "Error",
+                    MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+        }
+
+        private void cbRssElements_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (cbiGreater == null || cbiLower == null) return;
+            if (cbRssElements.SelectedIndex == 3)
+            {
+                cbiGreater.Visibility = Visibility.Visible;
+                cbiLower.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                cbiGreater.Visibility = Visibility.Collapsed;
+                cbiLower.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        private void btnSelectAction_Click(object sender, RoutedEventArgs e)
+        {
+           
+            if (fap.ShowDialog() == true)
+            {
+                _actionSet = true;
+            }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            fap.Owner = this;
+        }
+    }
+}
diff --git a/WinHue3/Addons/RssFeedMonitor/RssFeedAlertHandler.cs b/WinHue3/Addons/RssFeedMonitor/RssFeedAlertHandler.cs
new file mode 100644
index 00000000..9d71f207
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/RssFeedAlertHandler.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Xml.Serialization;
+
+namespace WinHue3
+{
+    public static class RssFeedAlertHandler
+    {
+        private static string ext = "ra";
+        private static string folder = "rssalert";
+
+        static RssFeedAlertHandler()
+        {
+            CheckFolderExists();
+        }
+
+        public static List<Alert> LoadRssFeedAlerts()
+        {
+            List<Alert> listConditions = new List<Alert>();
+            XmlSerializer xser = new XmlSerializer(typeof(Alert));
+            string[] listWa;
+
+            try
+            {
+                listWa = Directory.GetFiles(folder, "*." + ext);
+            }
+            catch (Exception)
+            {
+                DirectoryInfo df = Directory.CreateDirectory(folder); // Directory Information for the created WeatherAlert folder
+                listWa = Directory.GetFiles(df.FullName, "*." + ext);
+            }
+
+            foreach (string s in listWa)
+            {
+                try
+                {
+                    FileStream fs = new FileStream(s, FileMode.Open);
+                    Alert cond = (Alert)xser.Deserialize(fs);
+                    listConditions.Add(cond);
+                    fs.Close();
+                }
+                catch (Exception)
+                {
+                    
+                    
+                }
+            }
+
+            return listConditions;
+                
+        }
+
+        public static bool SaveFeedAlert(Alert condition)
+        {
+            bool result = false;
+            try
+            {
+                CheckFolderExists();
+                FileStream fs = File.Create(folder + "\\" + condition.Name + "." + ext);
+                XmlSerializer xser = new XmlSerializer(condition.GetType());
+                xser.Serialize(fs, condition);
+                fs.Close();
+                result = true;
+            }
+            catch (Exception)
+            {
+                result = false;
+            }
+            return result;
+        }
+
+        public static bool DeleteFeedAlert(Alert alert)
+        {
+            bool result = false;
+            try
+            {
+                File.Delete(folder +"/"+ alert.Name + "." + ext);
+                result = true;
+            }
+            catch (Exception)
+            {
+                result = false;
+
+            }
+            return result;
+
+        }
+
+        public static bool DeleteFeedAlert(string alertname)
+        {
+            bool result = false;
+            try
+            {
+
+                File.Delete(folder + "/" + alertname + "." + ext);
+                result = true;
+            }
+            catch (Exception)
+            {
+                result = false;
+
+            }
+            return result;
+
+        }
+        public static bool RssFeedAlertExists(string name)
+        {
+            return File.Exists(folder + "\\" + name + "." + ext);
+        }
+
+        private static bool CheckFolderExists()
+        {
+            bool result = true;
+            if (Directory.Exists(folder)) return result;
+
+            try
+            {
+                Directory.CreateDirectory(folder);
+            }
+            catch (Exception)
+            {
+                result = false;
+            }
+            
+            return result;
+        }
+    }
+}
\ No newline at end of file
diff --git a/WinHue3/Addons/RssFeedMonitor/RssFeedMonitor.cs b/WinHue3/Addons/RssFeedMonitor/RssFeedMonitor.cs
new file mode 100644
index 00000000..6ceed3dd
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/RssFeedMonitor.cs
@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+using System.Threading;
+using System.ComponentModel.Composition;
+
+using System.Drawing;
+using System.Windows;
+using System.ComponentModel;
+using System.ServiceModel.Syndication;
+using System.Windows.Threading;
+
+using System.Xml;
+
+namespace WinHue3
+{
+
+    public class RssFeedMonitor : View
+    {
+        private readonly BackgroundWorker _bgw;
+        private readonly DispatcherTimer _rsstimer;
+        private bool _isrunning;
+
+        public RssFeedMonitor()
+        {
+            _bgw = new BackgroundWorker();
+            _rsstimer = new DispatcherTimer();
+            _rsstimer.Interval = new TimeSpan(0, Properties.Settings.Default.UpdateInterval, 0);
+            _rsstimer.Tick += RssTimer_Tick;
+            _bgw.DoWork += Bgw_DoWork;
+            
+        }
+
+        private void RssTimer_Tick(object sender, EventArgs e)
+        {
+            _bgw.RunWorkerAsync();
+        }
+
+        public bool? ShowSettingsForm()
+        {
+            RssFeedMonitorSettingsForm sf = new RssFeedMonitorSettingsForm() {Owner = Application.Current.MainWindow};
+            sf.ShowDialog();
+            return true;
+        }
+
+        public void Start()
+        {
+            _rsstimer.Start();
+            IsRunning = true;
+        }
+
+        public void Stop()
+        {
+            _rsstimer.Stop();
+            IsRunning = false;
+        }
+
+        private void Bgw_DoWork(object sender, DoWorkEventArgs e)
+        {
+            CheckAlertAndTriggers();
+        }
+
+        public bool IsRunning
+        {
+            get { return _isrunning; }
+            private set { _isrunning = true; OnPropertyChanged(); }
+        }
+
+        public void CheckAlertAndTriggers()
+        {
+            List<Alert> listAlert = RssFeedAlertHandler.LoadRssFeedAlerts();
+            SyndicationFeed sf;
+
+            foreach (Alert a in listAlert)
+            {
+                XmlReader xr = XmlReader.Create(a.Url);
+                sf = SyndicationFeed.Load(xr);
+                if (sf == null) return;
+
+                List<SyndicationItem> si = sf.Items.ToList();
+
+                if (a.Criterias.Exists(x => x.RSSElement == "Title") == true)
+                {
+                    Criteria cr = (Criteria)a.Criterias.Select(x => x.RSSElement == "Title");
+                    if (cr.Condition == "Contains")
+                        si.RemoveAll(x => !x.Title.Text.Contains(cr.UserCondition));
+
+                    if (cr.Condition == "Equals")
+                        si.RemoveAll(x => x.Title.Text != cr.UserCondition);
+                }
+
+                if (a.Criterias.Exists(x => x.RSSElement == "Description") == true)
+                {
+                    Criteria cr = (Criteria)a.Criterias.Select(x => x.RSSElement == "Description");
+                    if (cr.Condition == "Contains")
+                        si.RemoveAll(x => !x.Summary.Text.Contains(cr.UserCondition));
+
+                    if (cr.Condition == "Equals")
+                        si.RemoveAll(x => x.Summary.Text != cr.UserCondition);
+                }
+
+                if (a.Criterias.Exists(x => x.RSSElement == "Publication Date") == true)
+                {
+                    Criteria cr = (Criteria)a.Criterias.Select(x => x.RSSElement == "Title");
+                    if (cr.Condition == "Contains")
+                        si.RemoveAll(x => !x.PublishDate.ToString().Contains(cr.UserCondition));
+
+                    if (cr.Condition == "Equals")
+                        si.RemoveAll(x => x.PublishDate.ToString() != cr.UserCondition);
+
+                    if (cr.Condition == "Greater")
+                        si.RemoveAll(x => x.PublishDate > DateTimeOffset.Parse(cr.UserCondition));
+
+                    if (cr.Condition == "Lower")
+                        si.RemoveAll(x => x.PublishDate < DateTimeOffset.Parse(cr.UserCondition));
+                }
+
+                if (a.Criterias.Exists(x => x.RSSElement == "Category") == true)
+                {
+                    Criteria cr = (Criteria)a.Criterias.Select(x => x.RSSElement == "Title");
+                    /*if (cr.Condition == "Contains")
+                        si.RemoveAll(x => !x.Categories.Contains.Text.Contains(cr.UserCondition));*/
+
+                        /*if (cr.Condition == "Equals")
+                        si.RemoveAll(x => x.Title.Text != cr.UserCondition);*/
+                }
+
+                if (si.Count > 0)
+                {
+                    // Do ALERT ABOUT IT.
+
+                }
+            }
+        }
+
+        public Bitmap pluginIcon => Properties.Resources.rss; 
+
+        public string pluginName => "Rss Feed Monitor";
+
+        public string pluginDesc => "Gives an alert when a specific rss feed meets the requirements.";
+
+        public string pluginAuth => "Pascal Pharand";
+    }
+}
diff --git a/WinHue3/Addons/RssFeedMonitor/RssFeedMonitorSettingsForm.xaml b/WinHue3/Addons/RssFeedMonitor/RssFeedMonitorSettingsForm.xaml
new file mode 100644
index 00000000..8d2bf9da
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/RssFeedMonitorSettingsForm.xaml
@@ -0,0 +1,30 @@
+<Window
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" x:Class="WinHue3.RssFeedMonitorSettingsForm"
+        Title="Settings..." Height="361.431" Width="538.651" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" Loaded="Window_Loaded">
+    <Grid>
+        <ListBox x:Name="lbConditionList" HorizontalAlignment="Left" Height="305" Margin="10,10,0,0" VerticalAlignment="Top" Width="226" DisplayMemberPath="Name" SelectionChanged="lbConditionList_SelectionChanged"/>
+
+        <Button x:Name="btnCancel" Content="Cancel" HorizontalAlignment="Left" Margin="431,295,0,0" VerticalAlignment="Top" Width="81" Click="btnCancel_Click"/>
+        <Button x:Name="btnSave" Content="Save" HorizontalAlignment="Left" Margin="351,295,0,0" VerticalAlignment="Top" Width="75" Click="btnSave_Click"/>
+        <Button x:Name="btnNew" Content="New Alert" HorizontalAlignment="Left" Margin="241,295,0,0" VerticalAlignment="Top" Width="105" Click="btnNew_Click"/>
+
+        <GroupBox x:Name="groupBox" Header="General Settings" HorizontalAlignment="Left" Margin="241,149,0,0" VerticalAlignment="Top" Height="141" Width="271">
+            <Grid>
+                <xctk:IntegerUpDown x:Name="nudUpdateInterval" HorizontalAlignment="Left" Margin="5,10,0,0" VerticalAlignment="Top" Width="244" Minimum="1" Maximum="60" Value="5" FormatString="Check every # minute(s)" ToolTip="This delay applies to all conditions."/>
+                <TextBlock x:Name="textBlock" HorizontalAlignment="Left" Margin="5,35,0,0" TextWrapping="Wrap" Text="Warning : Do not use the rss feed system for life threatening situations. I will not be held responsible if, for any reasons, the monitor or WinHue does not trigger your actions upon an alert." VerticalAlignment="Top" Height="79" Width="244" FontSize="10"/>
+            </Grid>
+        </GroupBox>
+        <GroupBox x:Name="groupBox1" Header="Alert Information" HorizontalAlignment="Left" Margin="241,0,0,0" VerticalAlignment="Top" Height="149" Width="271">
+            <Grid>
+                <Label x:Name="label" Content="Name : " HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                <Label x:Name="label1" Content="Description : " HorizontalAlignment="Left" Margin="0,26,0,0" VerticalAlignment="Top"/>
+                <Button x:Name="btnEdit" Content="Edit" HorizontalAlignment="Left" Margin="225,107,0,0" VerticalAlignment="Top" Width="34" Click="btnEdit_Click" IsEnabled="false"/>
+                <CheckBox x:Name="chbIsEnabled" Content="Enabled" HorizontalAlignment="Left" Margin="5,57,0,0" VerticalAlignment="Top"  />
+                <Label x:Name="lblName" Content="Label" HorizontalAlignment="Left" Margin="84,0,0,0" VerticalAlignment="Top" Width="175"/>
+                <Label x:Name="lblDescription" Content="Label" HorizontalAlignment="Left" Margin="84,26,0,0" VerticalAlignment="Top" Width="175"/>
+            </Grid>
+        </GroupBox>
+    </Grid>
+</Window>
diff --git a/WinHue3/Addons/RssFeedMonitor/RssFeedMonitorSettingsForm.xaml.cs b/WinHue3/Addons/RssFeedMonitor/RssFeedMonitorSettingsForm.xaml.cs
new file mode 100644
index 00000000..bfbffc58
--- /dev/null
+++ b/WinHue3/Addons/RssFeedMonitor/RssFeedMonitorSettingsForm.xaml.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using System.Xaml;
+using System.Xml;
+
+
+namespace WinHue3
+{
+    /// <summary>
+    /// Interaction logic for WeatherSettingsForm.xaml
+    /// </summary>
+    public partial class RssFeedMonitorSettingsForm : Window
+    {
+
+        public RssFeedMonitorSettingsForm()
+        {
+            InitializeComponent();
+        }
+
+        private void btnNew_Click(object sender, RoutedEventArgs e)
+        {
+            Form_AlertCreator fcc = new Form_AlertCreator() {Owner = this};
+            if (fcc.ShowDialog() == true)
+            {
+                PopulateAlertList();
+            }
+
+        }
+
+        private void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+            Close();
+        }
+
+        private void PopulateAlertList()
+        {
+            List<Alert> listConditions = RssFeedAlertHandler.LoadRssFeedAlerts();
+
+            foreach (Alert c in listConditions)
+            {
+                lbConditionList.Items.Add(c);
+            }
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            PopulateAlertList();
+        }
+
+        private void btnEdit_Click(object sender, RoutedEventArgs e)
+        {
+            if (lbConditionList.SelectedItem == null) return;
+            Form_AlertCreator fac = new Form_AlertCreator((Alert)lbConditionList.SelectedItem) {Owner = this};
+            if(fac.ShowDialog() == true)
+                PopulateAlertList();
+            
+        }
+
+        private void btnSave_Click(object sender, RoutedEventArgs e)
+        {
+            Properties.Settings.Default.UpdateInterval = (int)nudUpdateInterval.Value;
+            Properties.Settings.Default.Save();
+            Close();
+        }
+
+        private void lbConditionList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if(lbConditionList.SelectedItem == null)
+            {
+                lblName.Content = "none";
+                lblDescription.Content = "none";
+                chbIsEnabled.IsChecked = null;
+                btnEdit.IsEnabled = false;
+            }
+            else
+            {
+                Alert current = (Alert)lbConditionList.SelectedItem;
+                lblName.Content = current.Name;
+                lblDescription.Content = current.Description;
+                chbIsEnabled.IsChecked = current.Enabled;
+                btnEdit.IsEnabled = true;
+            }
+        }
+    }
+}
diff --git a/WinHue3/App.config b/WinHue3/App.config
index 392e2f19..45d0cb86 100644
--- a/WinHue3/App.config
+++ b/WinHue3/App.config
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="WinHue3.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
     </configSections>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
@@ -21,4 +24,38 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <userSettings>
+    <WinHue3.Properties.Settings>
+      <setting name="CPUTemp_gradientStartColor" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="CPUTemp_gradientStartTemp" serializeAs="String">
+        <value>30</value>
+      </setting>
+      <setting name="CPUTemp_gradientStopColor" serializeAs="String">
+        <value>25000</value>
+      </setting>
+      <setting name="CPUTemp_gradientStopTemp" serializeAs="String">
+        <value>75</value>
+      </setting>
+      <setting name="CPUTemp_ObjectID" serializeAs="String">
+        <value />
+      </setting>
+      <setting name="CPUTemp_ObjectType" serializeAs="String">
+        <value>False</value>
+      </setting>
+      <setting name="CpuTemp_Brightness" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="CPUTemp_Saturation" serializeAs="String">
+        <value>0</value>
+      </setting>
+      <setting name="UpdateInterval" serializeAs="String">
+        <value>5</value>
+      </setting>
+      <setting name="CPUTemp_SensorName" serializeAs="String">
+        <value />
+      </setting>
+    </WinHue3.Properties.Settings>
+  </userSettings>
 </configuration>
diff --git a/WinHue3/Hotkeys/HotKeyHandle.cs b/WinHue3/Hotkeys/HotKeyHandle.cs
new file mode 100644
index 00000000..e5a97b0a
--- /dev/null
+++ b/WinHue3/Hotkeys/HotKeyHandle.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net.Mime;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Interop;
+
+namespace WinHue3
+{
+    public class HotKeyHandle : IDisposable
+    {
+        private static Dictionary<int, HotKeyHandle> _dictHotKeyToCalBackProc;
+
+        [DllImport("user32.dll")]
+        private static extern bool RegisterHotKey(IntPtr hWnd, int id, uint fsModifiers, uint vlc);
+
+        [DllImport("user32.dll")]
+        private static extern bool UnregisterHotKey(IntPtr hWnd, int id);
+
+        public const int WmHotKey = 0x0312;
+
+        private bool _disposed = false;
+
+        public Key Key { get; private set; }
+        public ModifierKeys KeyModifiers { get; private set; }
+        public Action<HotKeyHandle> Action { get; private set; }
+        public int Id { get; set; }
+
+        // ******************************************************************
+        public HotKeyHandle(HotKey h, Action<HotKeyHandle> action, bool register = true)
+        {
+            Key = h.Key;
+            KeyModifiers = h.Modifier;
+            Action = action;
+            if (register)
+            {
+                Register();
+            }
+        }
+
+        // ******************************************************************
+        public bool Register()
+        {
+            int virtualKeyCode = KeyInterop.VirtualKeyFromKey(Key);
+            Id = virtualKeyCode + ((int)KeyModifiers * 0x10000);
+            bool result = RegisterHotKey(IntPtr.Zero, Id, (uint)KeyModifiers, (uint)virtualKeyCode);
+
+            if (_dictHotKeyToCalBackProc == null)
+            {
+                _dictHotKeyToCalBackProc = new Dictionary<int, HotKeyHandle>();
+                ComponentDispatcher.ThreadFilterMessage += new ThreadMessageEventHandler(ComponentDispatcherThreadFilterMessage);
+            }
+
+            _dictHotKeyToCalBackProc.Add(Id, this);
+
+            Debug.Print(result.ToString() + ", " + Id + ", " + virtualKeyCode);
+            return result;
+        }
+
+        // ******************************************************************
+        public void Unregister()
+        {
+            HotKeyHandle hotKey;
+            if (_dictHotKeyToCalBackProc.TryGetValue(Id, out hotKey))
+            {
+                UnregisterHotKey(IntPtr.Zero, Id);
+            }
+        }
+
+        // ******************************************************************
+        private static void ComponentDispatcherThreadFilterMessage(ref MSG msg, ref bool handled)
+        {
+            if (!handled)
+            {
+                if (msg.message == WmHotKey)
+                {
+                    HotKeyHandle hotKey;
+
+                    if (_dictHotKeyToCalBackProc.TryGetValue((int)msg.wParam, out hotKey))
+                    {
+                        if (hotKey.Action != null)
+                        {
+                            hotKey.Action.Invoke(hotKey);
+                        }
+                        handled = true;
+                    }
+                }
+            }
+        }
+
+        // ******************************************************************
+        // Implement IDisposable.
+        // Do not make this method virtual.
+        // A derived class should not be able to override this method.
+        public void Dispose()
+        {
+            Dispose(true);
+            // This object will be cleaned up by the Dispose method.
+            // Therefore, you should call GC.SupressFinalize to
+            // take this object off the finalization queue
+            // and prevent finalization code for this object
+            // from executing a second time.
+            GC.SuppressFinalize(this);
+        }
+
+        // ******************************************************************
+        // Dispose(bool disposing) executes in two distinct scenarios.
+        // If disposing equals true, the method has been called directly
+        // or indirectly by a user's code. Managed and unmanaged resources
+        // can be _disposed.
+        // If disposing equals false, the method has been called by the
+        // runtime from inside the finalizer and you should not reference
+        // other objects. Only unmanaged resources can be _disposed.
+        protected virtual void Dispose(bool disposing)
+        {
+            // Check to see if Dispose has already been called.
+            if (!this._disposed)
+            {
+                // If disposing equals true, dispose all managed
+                // and unmanaged resources.
+                if (disposing)
+                {
+                    // Dispose managed resources.
+                    Unregister();
+                }
+
+                // Note disposing has been done.
+                _disposed = true;
+            }
+        }
+    }
+
+    // ******************************************************************
+    [Flags]
+    public enum KeyModifier
+    {
+        None = 0x0000,
+        Alt = 0x0001,
+        Ctrl = 0x0002,
+        NoRepeat = 0x4000,
+        Shift = 0x0004,
+        Win = 0x0008
+    }
+
+    // ******************************************************************
+}
\ No newline at end of file
diff --git a/WinHue3/MainWindow.xaml b/WinHue3/MainWindow.xaml
index d5a7e538..69ec9f74 100644
--- a/WinHue3/MainWindow.xaml
+++ b/WinHue3/MainWindow.xaml
@@ -63,21 +63,22 @@
                 </RibbonGroup>
 
             </RibbonTab>
-            <RibbonTab Header="{x:Static resx:GUI.MainForm_Tab_Plugins}">
-                <RibbonGroup x:Name="rgAvailablePlugins" Header="" Width="auto" ItemsSource="{Binding ListPlugins}"  >
-                    <RibbonGroup.ItemTemplate>
-                        <DataTemplate>
-                            <ContentControl Content="{Binding}"/>
-                        </DataTemplate>
-                    </RibbonGroup.ItemTemplate>
+            <RibbonTab Header="{x:Static resx:GUI.MainForm_Tab_Tools}">
+                <RibbonGroup Header="" Width="auto">
+                    <RibbonSplitButton x:Name="btnCpuTempMon" Label="{x:Static resx:GUI.MainForm_ToolsTab_CpuTempMon}" CommandParameter="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" Command="{Binding CpuTempMonCommand}"  LargeImageSource="Resources/cputemp.png" IsEnabled="{Binding EnableControls}" >
+                        <RibbonButton Label="{x:Static resx:GUI.MainForm_ToolsTab_Settings}" Command="{Binding CpuTempMonSettingsCommand}" IsEnabled="{Binding CanSetCpuTempSettings}"/>
+                    </RibbonSplitButton>
+                    <RibbonSplitButton x:Name="btnRssFeedMon" Label="{x:Static resx:GUI.MainForm_ToolsTab_RssFeed}" CommandParameter="{Binding Path=IsChecked, RelativeSource={RelativeSource Self}}" LargeImageSource="Resources/rss.png" IsEnabled="False" >
+                        <RibbonButton Label="{x:Static resx:GUI.MainForm_ToolsTab_Settings}" Command="{Binding RssFeedMonSettingsCommand}"/>
+                    </RibbonSplitButton>
                 </RibbonGroup>
 
             </RibbonTab>
             <RibbonTab Header="{x:Static resx:GUI.MainForm_Tab_View}" HorizontalAlignment="Stretch" VerticalAlignment="Top">
                 <RibbonGroup x:Name="rgViews" Header="" Width="auto">
-                    <RibbonButton x:Name="btnScenesMapping" Label="{x:Static resx:GUI.MainForm_Tab_View_SceneMapping}" Command="{Binding ViewSceneMappingCommand}" LargeImageSource="Resources/SceneMapping.png"/>
-                    <RibbonButton x:Name="btnBulbView" Label="{x:Static resx:GUI.MainForm_Tab_View_BulbsView}" Command="{Binding ViewBulbsCommand}" LargeImageSource="Resources/BulbView.png" />
-                    <RibbonButton x:Name="btnGroupView" Label="{x:Static resx:GUI.MainForm_Tab_View_GroupsView}" Command="{Binding ViewGroupsCommand}" LargeImageSource="Resources/GroupView.png" />
+                    <RibbonButton x:Name="btnScenesMapping" Label="{x:Static resx:GUI.MainForm_Tab_View_SceneMapping}" Command="{Binding ViewSceneMappingCommand}" LargeImageSource="Resources/SceneMapping.png" IsEnabled="{Binding EnableControls}"/>
+                    <RibbonButton x:Name="btnBulbView" Label="{x:Static resx:GUI.MainForm_Tab_View_BulbsView}" Command="{Binding ViewBulbsCommand}" LargeImageSource="Resources/BulbView.png" IsEnabled="{Binding EnableControls}" />
+                    <RibbonButton x:Name="btnGroupView" Label="{x:Static resx:GUI.MainForm_Tab_View_GroupsView}" Command="{Binding ViewGroupsCommand}" LargeImageSource="Resources/GroupView.png" IsEnabled="{Binding EnableControls}"/>
                 </RibbonGroup>
             </RibbonTab>
             <RibbonTab Header="{x:Static resx:GUI.MainForm_Tab_Help}" HorizontalAlignment="Stretch" VerticalAlignment="Top">
@@ -183,7 +184,7 @@
                     <Slider x:Name="slHue" Height="21" VerticalAlignment="Top" Maximum="65535" Margin="10,0,10,10" Width="Auto" IsSnapToTickEnabled="True" Value="{Binding SliderHue}"  IsEnabled="{Binding EnableHueSlider, FallbackValue=false}"  AutoToolTipPlacement="TopLeft" ToolTip="{Binding Value, ElementName=slHue}" IsMoveToPointEnabled="True" >
                         <i:Interaction.Triggers>
                             <i:EventTrigger EventName="PreviewMouseUp">
-                                <i:InvokeCommandAction Command="{Binding SliderHueChangedCommand}"/>
+                                <i:InvokeCommandAction Command="{Binding SliderHueChangedCommand}" />
                             </i:EventTrigger>
                             <i:EventTrigger EventName="PreviewKeyUp">
                                 <i:InvokeCommandAction Command="{Binding KeyPressHueColorCommand}"/>
diff --git a/WinHue3/Properties/Resources.Designer.cs b/WinHue3/Properties/Resources.Designer.cs
index 0b8dc7c3..6c2c0e4b 100644
--- a/WinHue3/Properties/Resources.Designer.cs
+++ b/WinHue3/Properties/Resources.Designer.cs
@@ -390,6 +390,16 @@ public static System.Drawing.Bitmap rgbcolor {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap rss {
+            get {
+                object obj = ResourceManager.GetObject("rss", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/WinHue3/Properties/Resources.resx b/WinHue3/Properties/Resources.resx
index a49d7673..5076bef0 100644
--- a/WinHue3/Properties/Resources.resx
+++ b/WinHue3/Properties/Resources.resx
@@ -382,4 +382,7 @@
   <data name="BulbView" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\BulbView.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="rss" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\rss.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WinHue3/Properties/Settings.Designer.cs b/WinHue3/Properties/Settings.Designer.cs
index 451904aa..bf109ea3 100644
--- a/WinHue3/Properties/Settings.Designer.cs
+++ b/WinHue3/Properties/Settings.Designer.cs
@@ -22,5 +22,125 @@ public static Settings Default {
                 return defaultInstance;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public double CPUTemp_gradientStartColor {
+            get {
+                return ((double)(this["CPUTemp_gradientStartColor"]));
+            }
+            set {
+                this["CPUTemp_gradientStartColor"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("30")]
+        public double CPUTemp_gradientStartTemp {
+            get {
+                return ((double)(this["CPUTemp_gradientStartTemp"]));
+            }
+            set {
+                this["CPUTemp_gradientStartTemp"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("25000")]
+        public double CPUTemp_gradientStopColor {
+            get {
+                return ((double)(this["CPUTemp_gradientStopColor"]));
+            }
+            set {
+                this["CPUTemp_gradientStopColor"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("75")]
+        public double CPUTemp_gradientStopTemp {
+            get {
+                return ((double)(this["CPUTemp_gradientStopTemp"]));
+            }
+            set {
+                this["CPUTemp_gradientStopTemp"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string CPUTemp_ObjectID {
+            get {
+                return ((string)(this["CPUTemp_ObjectID"]));
+            }
+            set {
+                this["CPUTemp_ObjectID"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool CPUTemp_ObjectType {
+            get {
+                return ((bool)(this["CPUTemp_ObjectType"]));
+            }
+            set {
+                this["CPUTemp_ObjectType"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public byte CpuTemp_Brightness {
+            get {
+                return ((byte)(this["CpuTemp_Brightness"]));
+            }
+            set {
+                this["CpuTemp_Brightness"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("0")]
+        public byte CPUTemp_Saturation {
+            get {
+                return ((byte)(this["CPUTemp_Saturation"]));
+            }
+            set {
+                this["CPUTemp_Saturation"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("5")]
+        public int UpdateInterval {
+            get {
+                return ((int)(this["UpdateInterval"]));
+            }
+            set {
+                this["UpdateInterval"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string CPUTemp_SensorName {
+            get {
+                return ((string)(this["CPUTemp_SensorName"]));
+            }
+            set {
+                this["CPUTemp_SensorName"] = value;
+            }
+        }
     }
 }
diff --git a/WinHue3/Properties/Settings.settings b/WinHue3/Properties/Settings.settings
index 8e615f25..7c3ecdef 100644
--- a/WinHue3/Properties/Settings.settings
+++ b/WinHue3/Properties/Settings.settings
@@ -1,5 +1,36 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="WinHue3.Properties" GeneratedClassName="Settings">
   <Profiles />
-  <Settings />
+  <Settings>
+    <Setting Name="CPUTemp_gradientStartColor" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="CPUTemp_gradientStartTemp" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">30</Value>
+    </Setting>
+    <Setting Name="CPUTemp_gradientStopColor" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">25000</Value>
+    </Setting>
+    <Setting Name="CPUTemp_gradientStopTemp" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">75</Value>
+    </Setting>
+    <Setting Name="CPUTemp_ObjectID" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="CPUTemp_ObjectType" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="CpuTemp_Brightness" Type="System.Byte" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="CPUTemp_Saturation" Type="System.Byte" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="UpdateInterval" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">5</Value>
+    </Setting>
+    <Setting Name="CPUTemp_SensorName" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+  </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/WinHue3/Resources/GUI.Designer.cs b/WinHue3/Resources/GUI.Designer.cs
index a75986e1..aaa7dc91 100644
--- a/WinHue3/Resources/GUI.Designer.cs
+++ b/WinHue3/Resources/GUI.Designer.cs
@@ -1510,11 +1510,11 @@ public static string MainForm_Tab_Home_Group_SettingsUpdateButton {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Plugins.
+        ///   Looks up a localized string similar to Tools.
         /// </summary>
-        public static string MainForm_Tab_Plugins {
+        public static string MainForm_Tab_Tools {
             get {
-                return ResourceManager.GetString("MainForm_Tab_Plugins", resourceCulture);
+                return ResourceManager.GetString("MainForm_Tab_Tools", resourceCulture);
             }
         }
         
@@ -1554,6 +1554,33 @@ public static string MainForm_Tab_View_SceneMapping {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Cpu Temp Monitor.
+        /// </summary>
+        public static string MainForm_ToolsTab_CpuTempMon {
+            get {
+                return ResourceManager.GetString("MainForm_ToolsTab_CpuTempMon", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to RSS Feed Monitor.
+        /// </summary>
+        public static string MainForm_ToolsTab_RssFeed {
+            get {
+                return ResourceManager.GetString("MainForm_ToolsTab_RssFeed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Settings.
+        /// </summary>
+        public static string MainForm_ToolsTab_Settings {
+            get {
+                return ResourceManager.GetString("MainForm_ToolsTab_Settings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Brightness.
         /// </summary>
diff --git a/WinHue3/Resources/GUI.fr.resx b/WinHue3/Resources/GUI.fr.resx
index e4c0104d..bcbb590e 100644
--- a/WinHue3/Resources/GUI.fr.resx
+++ b/WinHue3/Resources/GUI.fr.resx
@@ -426,8 +426,8 @@
   <data name="MainForm_Tab_Home_Group_SettingsUpdateButton" xml:space="preserve">
     <value>MAJ du micrologiciel</value>
   </data>
-  <data name="MainForm_Tab_Plugins" xml:space="preserve">
-    <value>Extensions</value>
+  <data name="MainForm_Tab_Tools" xml:space="preserve">
+    <value>Outils</value>
   </data>
   <data name="MainForm_ListView_Context_Delete" xml:space="preserve">
     <value>Effacer...</value>
@@ -1002,4 +1002,13 @@
   <data name="BridgeDetectionPairing_DetectBridge_Tooltip" xml:space="preserve">
     <value>Trouver vos passerelles en utilisant le portail de philips et l'UPNP.</value>
   </data>
+  <data name="MainForm_ToolsTab_CpuTempMon" xml:space="preserve">
+    <value>Moniteur de Température CPU</value>
+  </data>
+  <data name="MainForm_ToolsTab_RssFeed" xml:space="preserve">
+    <value>Moniteur de flux RSS</value>
+  </data>
+  <data name="MainForm_ToolsTab_Settings" xml:space="preserve">
+    <value>Paramètres</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WinHue3/Resources/GUI.resx b/WinHue3/Resources/GUI.resx
index 4264b84e..8400d89b 100644
--- a/WinHue3/Resources/GUI.resx
+++ b/WinHue3/Resources/GUI.resx
@@ -426,8 +426,8 @@
   <data name="MainForm_Tab_Home_Group_SettingsUpdateButton" xml:space="preserve">
     <value>Update Firmware</value>
   </data>
-  <data name="MainForm_Tab_Plugins" xml:space="preserve">
-    <value>Plugins</value>
+  <data name="MainForm_Tab_Tools" xml:space="preserve">
+    <value>Tools</value>
   </data>
   <data name="MainForm_ListView_Context_Delete" xml:space="preserve">
     <value>Delete...</value>
@@ -1002,4 +1002,13 @@
   <data name="BridgeDetectionPairing_DetectBridge_Tooltip" xml:space="preserve">
     <value>Detect your bridges using the philips hue portal and UPNP.</value>
   </data>
+  <data name="MainForm_ToolsTab_CpuTempMon" xml:space="preserve">
+    <value>Cpu Temp Monitor</value>
+  </data>
+  <data name="MainForm_ToolsTab_RssFeed" xml:space="preserve">
+    <value>RSS Feed Monitor</value>
+  </data>
+  <data name="MainForm_ToolsTab_Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/WinHue3/Resources/rss.png b/WinHue3/Resources/rss.png
new file mode 100644
index 00000000..37864a85
Binary files /dev/null and b/WinHue3/Resources/rss.png differ
diff --git a/WinHue3/Utils/DelegateCommand.cs b/WinHue3/Utils/DelegateCommand.cs
index 864ed254..71b59f8a 100644
--- a/WinHue3/Utils/DelegateCommand.cs
+++ b/WinHue3/Utils/DelegateCommand.cs
@@ -4,46 +4,46 @@
 
 namespace WinHue3
 {
-  public class RelayCommand : ICommand
-    {
-        #region Fields 
-        readonly Action<object> _execute;
-        readonly Predicate<object> _canExecute;
-        #endregion
-        // Fields 
-        #region Constructors 
+      public class RelayCommand : ICommand
+      {
+            #region Fields 
+            readonly Action<object> _execute;
+            readonly Predicate<object> _canExecute;
+            #endregion
+            // Fields 
+            #region Constructors 
 
-        public RelayCommand(Action<object> execute) : this(execute, null)
-        {
+            public RelayCommand(Action<object> execute) : this(execute, null)
+            {
             
-        }
+            }
 
-        public RelayCommand(Action<object> execute, Predicate<object> canExecute)
-        {
-            if (execute == null) throw new ArgumentNullException("execute");
-            _execute = execute; _canExecute = canExecute;
-        }
-        #endregion
-        // Constructors 
-        #region ICommand Members 
+            public RelayCommand(Action<object> execute, Predicate<object> canExecute)
+            {
+                if (execute == null) throw new ArgumentNullException("execute");
+                _execute = execute; _canExecute = canExecute;
+            }
+            #endregion
+            // Constructors 
+            #region ICommand Members 
 
-        [DebuggerStepThrough]
-        public bool CanExecute(object parameter)
-        {
-            return _canExecute == null ? true : _canExecute(parameter);
-        }
+            [DebuggerStepThrough]
+            public bool CanExecute(object parameter)
+            {
+                return _canExecute == null ? true : _canExecute(parameter);
+            }
 
-        public event EventHandler CanExecuteChanged
-        {
-            add { CommandManager.RequerySuggested += value; }
-            remove { CommandManager.RequerySuggested -= value; }
-        }
+            public event EventHandler CanExecuteChanged
+            {
+                add { CommandManager.RequerySuggested += value; }
+                remove { CommandManager.RequerySuggested -= value; }
+            }
 
-        public void Execute(object parameter)
-        {
-            _execute(parameter);
-        }
-        #endregion
-        // ICommand Members 
-    }
-    }
+            public void Execute(object parameter)
+            {
+                _execute(parameter);
+            }
+            #endregion
+            // ICommand Members 
+     }
+}
diff --git a/WinHue3/Views/MainFormView.cs b/WinHue3/Views/MainFormView.cs
index da681e32..856217dc 100644
--- a/WinHue3/Views/MainFormView.cs
+++ b/WinHue3/Views/MainFormView.cs
@@ -36,7 +36,8 @@ public class MainFormView : View
         private readonly DispatcherTimer _refreshStates = new DispatcherTimer();
         private ObservableCollection<HueObject> _listBridgeObjects;
         private BackgroundWorker _bgwRefresher = new BackgroundWorker();
-
+        private CpuTempMonitor ctm = new CpuTempMonitor();
+        private RssFeedMonitor rfm = new RssFeedMonitor();
 
         public Form_EventLog _fel;
         private Form_SceneMapping _fsm;
@@ -75,14 +76,32 @@ public MainFormView(Form_EventLog fel)
             }
 
             LoadBridge();
+            LoadHotkeys();
+            
+        }
+
+        private void LoadHotkeys()
+        {
+
+            if (_lhk.Count > 0)
+            {
+                foreach (HotKeyHandle h in _lhk)
+                {
+                    h.Unregister();
+                    _lhk.Remove(h);
+                }
+            }
 
             foreach (HotKey h in _listHotKeys)
             {
-               _lhk.Add(new HotKeyHandle(h,new System.Action<HotKeyHandle>(HandleHotkey)));
+                _lhk.Add(new HotKeyHandle(h, new System.Action<HotKeyHandle>(HandleHotkey)));
             }
-            
+
+
         }
 
+        public bool CanSetCpuTempSettings => !ctm.IsRunning;
+
         private void _bgwRefresher_DoWork(object sender, DoWorkEventArgs e)
         {
 
@@ -615,6 +634,7 @@ private void LoadBridge()
                 }
                             
                 temp.OnMessageAdded += MessageAdded;
+                temp.BridgeNotResponding += Temp_BridgeNotResponding;
                 SelectedBridge = temp;
 
                 //LoadPlugins();
@@ -623,6 +643,12 @@ private void LoadBridge()
 
         }
 
+        private void Temp_BridgeNotResponding(object sender, EventArgs e)
+        {
+            BridgeStore.SelectedBridge = null;
+
+        }
+
         void MessageAdded(object sender, EventArgs e)
         {
             if (BridgeStore.SelectedBridge.lastMessages != null)
@@ -1214,6 +1240,7 @@ public void CreateHotKey()
             Form_HotKeyCreator fhkc = new Form_HotKeyCreator() {Owner = Application.Current.MainWindow};
             fhkc.ShowDialog();
             _listHotKeys = fhkc.GetHotKeys();
+            LoadHotkeys();
         }
 
         #endregion
@@ -1281,96 +1308,124 @@ private void ViewGroups()
             _fgv.Show();
         }
 
+        private void RunCpuTempMon()
+        {
+            if(!ctm.IsRunning)
+                ctm.Start();
+            else
+                ctm.Stop();
+            OnPropertyChanged("CanSetCpuTempSettings");
+        }
+
+        private void RunRssFeedMon()
+        {
+            if (!rfm.IsRunning)
+                rfm.Start();
+            else
+                rfm.Stop();
+        }
+
+        private void CpuTempMonSettings()
+        {
+            ctm.ShowSettingsForm();
+        }
+
+        private void RssFeedMonSettings()
+        {
+            rfm.ShowSettingsForm();
+        }
+
+
         #region PLUGINS
         /// <summary>
         /// Load all the plugins in the plugin folder.
         /// </summary>
         /// <returns></returns>
-        
-            /*
-        public bool LoadPlugins()
-        {
-            log.Info("Loading plugins...");
-            var catalog = new AggregateCatalog();
-            _plugins.Clear();
-
-            try
-            {
-                if (!Directory.Exists("plugins"))
-                {
-                    log.Warn("Plugin directory not found. Creating it...");
-                    DirectoryInfo df = Directory.CreateDirectory("plugins"); // Directory Information for the created mood folder
-                }
 
-                if (!Directory.Exists("lights"))
-                {
-                    log.Warn("Lights directory not found. Creating it...");
-                    DirectoryInfo df = Directory.CreateDirectory("lights"); // Directory Information for the created light folder
-                }
+        /*
+    public bool LoadPlugins()
+    {
+        log.Info("Loading plugins...");
+        var catalog = new AggregateCatalog();
+        _plugins.Clear();
 
-                catalog.Catalogs.Add(new DirectoryCatalog(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\plugins"));
-                catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly()));
-                CompositionContainer container = new CompositionContainer(catalog);
-                container.ComposeExportedValue("Bridge", BridgeStore.SelectedBridge);
-                container.ComposeParts(this);
-            }
-            catch (DirectoryNotFoundException ex)
-            {
-                log.Error("A needed directory was not found.", ex);
-            }
-            catch (UnauthorizedAccessException ex)
+        try
+        {
+            if (!Directory.Exists("plugins"))
             {
-                log.Error("Authorisation denied while creating a directory.",ex);
+                log.Warn("Plugin directory not found. Creating it...");
+                DirectoryInfo df = Directory.CreateDirectory("plugins"); // Directory Information for the created mood folder
             }
-            catch (Exception ex)
+
+            if (!Directory.Exists("lights"))
             {
-                log.Fatal("Errow while loading the plugins",ex);
+                log.Warn("Lights directory not found. Creating it...");
+                DirectoryInfo df = Directory.CreateDirectory("lights"); // Directory Information for the created light folder
             }
 
-            if (_availablePlugins == null) return false;
+            catalog.Catalogs.Add(new DirectoryCatalog(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\plugins"));
+            catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly()));
+            CompositionContainer container = new CompositionContainer(catalog);
+            container.ComposeExportedValue("Bridge", BridgeStore.SelectedBridge);
+            container.ComposeParts(this);
+        }
+        catch (DirectoryNotFoundException ex)
+        {
+            log.Error("A needed directory was not found.", ex);
+        }
+        catch (UnauthorizedAccessException ex)
+        {
+            log.Error("Authorisation denied while creating a directory.",ex);
+        }
+        catch (Exception ex)
+        {
+            log.Fatal("Errow while loading the plugins",ex);
+        }
+
+        if (_availablePlugins == null) return false;
 
-            foreach (IWinHuePluginModule plugin in _availablePlugins)
+        foreach (IWinHuePluginModule plugin in _availablePlugins)
+        {
+            log.Debug("Creating button for plugin" + plugin.pluginName);
+            RibbonSplitButtonPlugin pluginbutton = new RibbonSplitButtonPlugin()
             {
-                log.Debug("Creating button for plugin" + plugin.pluginName);
-                RibbonSplitButtonPlugin pluginbutton = new RibbonSplitButtonPlugin()
-                {
-                    Label = plugin.pluginName,
-                    LargeImageSource = GDIManager.CreateImageSourceFromImage(plugin.pluginIcon),
-                    Plugin = plugin,
-                };
+                Label = plugin.pluginName,
+                LargeImageSource = GDIManager.CreateImageSourceFromImage(plugin.pluginIcon),
+                Plugin = plugin,
+            };
 
-                pluginbutton.SetBinding(UIElement.IsEnabledProperty, new Binding("EnableControls"));
+            pluginbutton.SetBinding(UIElement.IsEnabledProperty, new Binding("EnableControls"));
 
-                pluginbutton.Click += Pluginbutton_Click;
+            pluginbutton.Click += Pluginbutton_Click;
 
-                RibbonButton settingsbutton = new RibbonButton() { Label = GlobalStrings.Plugin_Settings };
+            RibbonButton settingsbutton = new RibbonButton() { Label = GlobalStrings.Plugin_Settings };
 
-                settingsbutton.Click += delegate
+            settingsbutton.Click += delegate
+            {
+                pluginbutton.Plugin.Stop();
+                pluginbutton.IsChecked = false;
+                try
                 {
-                    pluginbutton.Plugin.Stop();
-                    pluginbutton.IsChecked = false;
-                    try
-                    {
-                        log.Debug("Showing settings for plugin " + plugin.pluginName);
-                        pluginbutton.Plugin.ShowSettingsForm();
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(string.Format(GlobalStrings.Error, pluginbutton.Plugin.pluginName), GlobalStrings.Error, MessageBoxButton.OK, MessageBoxImage.Error);
-                        GeneratePluginExceptionFile(ex, pluginbutton.Plugin);
-                        log.Fatal($@"Error trying to show plugin {pluginbutton.Plugin.pluginName} settings form",ex);
-                    }
+                    log.Debug("Showing settings for plugin " + plugin.pluginName);
+                    pluginbutton.Plugin.ShowSettingsForm();
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(string.Format(GlobalStrings.Error, pluginbutton.Plugin.pluginName), GlobalStrings.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+                    GeneratePluginExceptionFile(ex, pluginbutton.Plugin);
+                    log.Fatal($@"Error trying to show plugin {pluginbutton.Plugin.pluginName} settings form",ex);
+                }
 
-                };
+            };
 
-                pluginbutton.Items.Add(settingsbutton);
-                _plugins.Add(pluginbutton);
-                log.Info($"Loaded plugin {pluginbutton.Plugin.pluginName}.");
-            }
-            log.Info("Finished loading plugins.");
-            return true;
+            pluginbutton.Items.Add(settingsbutton);
+            _plugins.Add(pluginbutton);
+            log.Info($"Loaded plugin {pluginbutton.Plugin.pluginName}.");
         }
-        */
+        log.Info("Finished loading plugins.");
+        return true;
+    }
+    */
         /*
         private static void GeneratePluginExceptionFile(Exception excpt, IWinHuePluginModule plugin)
         {
@@ -1466,6 +1521,14 @@ private static void Pluginbutton_Click(object sender, RoutedEventArgs e)
         public ICommand ViewSceneMappingCommand => new RelayCommand(param => ViewSceneMapping());
         public ICommand ViewBulbsCommand => new RelayCommand(param => ViewBulbs());
         public ICommand ViewGroupsCommand => new RelayCommand(param => ViewGroups());
+        
+        //*************** Toolbar ******************************
+
+        public ICommand CpuTempMonCommand => new RelayCommand(param => RunCpuTempMon());
+        public ICommand RssFeedMonCommand => new RelayCommand(param => RunRssFeedMon());
+        public ICommand CpuTempMonSettingsCommand => new RelayCommand(param => CpuTempMonSettings());
+        public ICommand RssFeedMonSettingsCommand => new RelayCommand(param => RssFeedMonSettings());
+
         #endregion
     }
 }
\ No newline at end of file
diff --git a/WinHue3/WinHue3.csproj b/WinHue3/WinHue3.csproj
index 83b9c46d..a1676b72 100644
--- a/WinHue3/WinHue3.csproj
+++ b/WinHue3/WinHue3.csproj
@@ -14,6 +14,7 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -26,7 +27,6 @@
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
@@ -111,6 +111,7 @@
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Management" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="system.windows.controls.ribbon" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
@@ -157,6 +158,24 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Addons\CpuTempMon\CpuTemp.cs" />
+    <Compile Include="Addons\CpuTempMon\CpuTempMonitor.cs" />
+    <Compile Include="Addons\CpuTempMon\SettingsForm.xaml.cs">
+      <DependentUpon>SettingsForm.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Addons\RssFeedMonitor\Condition.cs" />
+    <Compile Include="Addons\RssFeedMonitor\Criteria.cs" />
+    <Compile Include="Addons\RssFeedMonitor\Form_ActionPicker.xaml.cs">
+      <DependentUpon>Form_ActionPicker.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Addons\RssFeedMonitor\Form_AlertCreator.xaml.cs">
+      <DependentUpon>Form_AlertCreator.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Addons\RssFeedMonitor\RssFeedAlertHandler.cs" />
+    <Compile Include="Addons\RssFeedMonitor\RssFeedMonitor.cs" />
+    <Compile Include="Addons\RssFeedMonitor\RssFeedMonitorSettingsForm.xaml.cs">
+      <DependentUpon>RssFeedMonitorSettingsForm.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Forms\Form_AddManualIp.xaml.cs">
       <DependentUpon>Form_AddManualIp.xaml</DependentUpon>
     </Compile>
@@ -185,8 +204,7 @@
     <Compile Include="Utils\BridgeStore.cs" />
     <Compile Include="Utils\DataGridViewAppender.cs" />
     <Compile Include="Utils\DgLogEntry.cs" />
-    <Compile Include="Utils\HotKey.cs" />
-    <Compile Include="Utils\HotkeyHandler.cs" />
+    <Compile Include="Hotkeys\HotKeyHandle.cs" />
     <Compile Include="Utils\MessageBoxError.cs" />
     <Compile Include="Utils\DelegateCommand.cs" />
     <Compile Include="Forms\Form_BridgeDetectionPairing.xaml.cs">
@@ -225,6 +243,22 @@
     <Compile Include="Views\SensorCreatorView.cs" />
     <Compile Include="Views\View.cs" />
     <Compile Include="Utils\WinHueSettings.cs" />
+    <Page Include="Addons\CpuTempMon\SettingsForm.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Addons\RssFeedMonitor\Form_ActionPicker.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Addons\RssFeedMonitor\Form_AlertCreator.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Addons\RssFeedMonitor\RssFeedMonitorSettingsForm.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Forms\Form_AnimationCreator.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -540,6 +574,8 @@
     <Content Include="lights\images\ZLL Light_unr.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Resource Include="Resources\rss.png" />
+    <Resource Include="Resources\cputemp.png" />
     <Resource Include="Resources\BulbView.png" />
     <Resource Include="Resources\GroupView.png" />
     <Resource Include="Resources\SceneMapping.png" />
@@ -569,7 +605,6 @@
     <Resource Include="Resources\HueLightOn-Large.png" />
     <Resource Include="Resources\HueLightOff-Large-Unr.png" />
     <Resource Include="Resources\HueLightOff-Large.png" />
-    <Resource Include="Resources\cputemp.png" />
     <Resource Include="Resources\weatheralert.png" />
     <Resource Include="Resources\powerfailure.png" />
     <Resource Include="Resources\HueTapFull.jpg" />
diff --git a/WinHue3_1.sln b/WinHue3_1.sln
index e533f09a..5a46b05a 100644
--- a/WinHue3_1.sln
+++ b/WinHue3_1.sln
@@ -7,12 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinHue3", "WinHue3\WinHue3.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "whc", "whc\whc.csproj", "{5DBA0713-9C41-447E-B064-F41BAB888891}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CpuTempMon", "CpuTempMon\CpuTempMon\CpuTempMon.csproj", "{C7CA3BB7-F708-4E24-B667-B05B6BC8EE5E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RssFeedMonitor", "WeatherAlert\RssFeedMonitor.csproj", "{2D648AD5-21F9-485C-BC71-0EDED51226BC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{09B8A807-6FA2-465D-896C-AE7EC5B23CCF}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SDK", "SDK", "{992CC356-127F-4033-94FC-5B83E04282EA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestUnit", "TestUnit", "{383AF157-5558-4EE8-8B8D-9A904C4F5FB0}"
@@ -36,12 +30,6 @@ Global
 		{5DBA0713-9C41-447E-B064-F41BAB888891}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5DBA0713-9C41-447E-B064-F41BAB888891}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5DBA0713-9C41-447E-B064-F41BAB888891}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7CA3BB7-F708-4E24-B667-B05B6BC8EE5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7CA3BB7-F708-4E24-B667-B05B6BC8EE5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7CA3BB7-F708-4E24-B667-B05B6BC8EE5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2D648AD5-21F9-485C-BC71-0EDED51226BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2D648AD5-21F9-485C-BC71-0EDED51226BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2D648AD5-21F9-485C-BC71-0EDED51226BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{85CBC875-2F5C-407B-BA9F-143611CDDA97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{85CBC875-2F5C-407B-BA9F-143611CDDA97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{85CBC875-2F5C-407B-BA9F-143611CDDA97}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -57,8 +45,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{C7CA3BB7-F708-4E24-B667-B05B6BC8EE5E} = {09B8A807-6FA2-465D-896C-AE7EC5B23CCF}
-		{2D648AD5-21F9-485C-BC71-0EDED51226BC} = {09B8A807-6FA2-465D-896C-AE7EC5B23CCF}
 		{F92374A7-45C3-415D-9BEB-6A87380FAA5B} = {992CC356-127F-4033-94FC-5B83E04282EA}
 		{A3B1C0A2-9982-401A-8C1B-7547CF91693C} = {383AF157-5558-4EE8-8B8D-9A904C4F5FB0}
 	EndGlobalSection
diff --git a/inno/Output/WinHue 3 BETA 18 Setup.exe b/inno/Output/WinHue 3 BETA 18 Setup.exe
new file mode 100644
index 00000000..d193286d
Binary files /dev/null and b/inno/Output/WinHue 3 BETA 18 Setup.exe differ
diff --git a/inno/installer.iss b/inno/installer.iss
index d1dd4897..852d0db6 100644
--- a/inno/installer.iss
+++ b/inno/installer.iss
@@ -42,8 +42,7 @@ Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\*.
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\whc.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\Xceed.Wpf.DataGrid.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\WinHue3.exe"; DestDir: "{app}"; Flags: ignoreversion
-Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\HueLib_base.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\HueLib.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\HueLib2.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\ManagedUPnP.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\OpenHardwareMonitorLib.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\NDesk.Options.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -58,8 +57,7 @@ Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\Xc
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\Microsoft.Expression.Interactions.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\fr\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\lights\*"; DestDir: "{app}\lights"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\moods\*"; DestDir: "{app}\moods"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: "D:\Documents\Visual Studio 2012\Projects\WinHue3_1\WinHue3\bin\Debug\plugins\*"; DestDir: "{app}\plugins"; Flags: ignoreversion
+
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/whc/ConsoleHandler.cs b/whc/ConsoleHandler.cs
index ed9a5dec..b42fc181 100644
--- a/whc/ConsoleHandler.cs
+++ b/whc/ConsoleHandler.cs
@@ -6,11 +6,8 @@
 using System.Net;
 using System.Runtime.Remoting.Channels;
 using NDesk.Options;
-using WinHue3;
 using System.Text;
-using HueLib;
 using Action = HueLib2.Action;
-using Rule = HueLib2.Rule;
 using HueLib2;
 
 namespace whc
@@ -121,10 +118,11 @@ static ConsoleHandler()
                         cmd = Command.DELETEGROUP;
                         if(PromptYesNo() || noprompt)
                         {
-                            if (bridge.DeleteGroup(v) == true)
+                            CommandResult bresult = bridge.RemoveObject<Group>(v);
+                            if (bresult.Success)
                             {
 
-                                WriteMessageToConsole(string.Format("Group {0} deleted succesfully.", v));
+                                WriteMessageToConsole($"Group {v} deleted succesfully.");
                             }
                             else
                                 WriteMessageToConsole("Error while deleting group :" + v);
@@ -138,10 +136,11 @@ static ConsoleHandler()
                     if (cmd == Command.NONE)
                     {
                         if(PromptYesNo() || noprompt)
-                        { 
-                            if (bridge.DeleteSchedule(v) == true)
+                        {
+                            CommandResult bresult = bridge.RemoveObject<Schedule>(v);
+                            if (bresult.Success)
                             {
-                                WriteMessageToConsole(string.Format("Schedule {0} deleted succesfully.", v));
+                                WriteMessageToConsole($"Schedule {v} deleted succesfully.");
                             }
                             else
                                 WriteMessageToConsole("Error while deleting schedule :" + v);
@@ -155,10 +154,11 @@ static ConsoleHandler()
                     if (cmd == Command.NONE)
                     {
                         if(PromptYesNo() || noprompt)
-                        {                        
-                            if (bridge.DeleteLight(v) == true)
+                        {
+                            CommandResult bresult = bridge.RemoveObject<Light>(v);         
+                            if (bresult.Success)
                             {
-                                WriteMessageToConsole(string.Format("Light {0} deleted succesfully.", v));
+                                WriteMessageToConsole($"Light {v} deleted succesfully.");
                             }
                             else
                                 WriteMessageToConsole("Error while deleting light :" + v);
@@ -172,10 +172,11 @@ static ConsoleHandler()
                     if (cmd == Command.NONE)
                     {
                         if(PromptYesNo() || noprompt)
-                        { 
-                            if (bridge.DeleteSensor(v) == true)
+                        {
+                            CommandResult bresult = bridge.RemoveObject<Sensor>(v);
+                            if (bresult.Success)
                             {
-                                WriteMessageToConsole(string.Format("Sensor {0} deleted succesfully.", v));
+                                WriteMessageToConsole($"Sensor {v} deleted succesfully.");
                             }
                             else
                                 WriteMessageToConsole("Error while deleting sensor :" + v);
@@ -189,10 +190,11 @@ static ConsoleHandler()
                     if (cmd == Command.NONE)
                     {
                         if(PromptYesNo() || noprompt)
-                        { 
-                            if (bridge.DeleteSensor(v) == true)
+                        {
+                            CommandResult bresult = bridge.RemoveObject<HueLib2.Rule>(v);
+                            if (bresult.Success)
                             {
-                                WriteMessageToConsole(string.Format("Rule {0} deleted succesfully.", v));
+                                WriteMessageToConsole($"Rule {v} deleted succesfully.");
                             }
                             else
                                 WriteMessageToConsole("Error while deleting rule :" + v);
@@ -203,103 +205,125 @@ static ConsoleHandler()
                 }},
                 {"ll", "List the lights available in the bridge", delegate(string v)
                 {
-                    Dictionary<string, Light> listLights = bridge.GetLightList();
-                    if(listLights != null)
-                    { 
+                    CommandResult bresult = bridge.GetListObjects<Light>();
+                    if(bresult.Success)
+                    {
+                        Dictionary<string, Light> listLights = (Dictionary<string, Light>)bresult.resultobject;
                         foreach(KeyValuePair<string,Light> kvp in listLights)
                         {
-                            WriteMessageToConsole(string.Format("[ID]={0}, Name={1}, ModelID={2}, Type={3}", kvp.Key, kvp.Value.name, kvp.Value.modelid, kvp.Value.type));
+                            WriteMessageToConsole(
+                                $"[ID]={kvp.Key}, Name={kvp.Value.name}, ModelID={kvp.Value.modelid}, Type={kvp.Value.type}");
                         } 
                     }               
                     else
                     {
-                        WriteMessageToConsole("An error occured while fetching the list of lights.");
+                        WriteMessageToConsole("An error occured while fetching the list of lights :" + bresult.resultobject );
                     }
                 }},
                 {"lg", "List the groups available in the bridge", delegate(string v)
                 {
-                    Dictionary<string, Group> listgroups = bridge.GetGroupList();
-                    if(listgroups != null)
-                    { 
+                    CommandResult bresult = bridge.GetListObjects<Group>();
+                    if(bresult.Success)
+                    {
+                        Dictionary<string, Group> listgroups = (Dictionary<string, Group>)bresult.resultobject;
                         foreach(KeyValuePair<string,Group> kvp in listgroups)
                         {
-                            WriteMessageToConsole(string.Format("[ID]={0}, Name={1}, MembersID=[{2}], Type={3}", kvp.Key, kvp.Value.name, string.Join(",", kvp.Value.lights), kvp.Value.type));
+                            WriteMessageToConsole(
+                                $"[ID]={kvp.Key}, Name={kvp.Value.name}, MembersID=[{string.Join(",", kvp.Value.lights)}], Type={kvp.Value.type}");
                         } 
                     }               
                     else
                     {
-                        WriteMessageToConsole("An error occured while fetching the list of groups.");
+                        WriteMessageToConsole("An error occured while fetching the list of groups : " + bresult.resultobject);
                     }
                 }},
                 {"ls", "List the scenes available in the bridge", delegate(string v)
                 {
-                    Dictionary<string, Scene> listscenes = bridge.GetScenesList();
-                    if(listscenes != null)
-                    { 
+                    CommandResult bresult = bridge.GetListObjects<Scene>();
+                    if(bresult.Success)
+                    {
+                        Dictionary<string, Scene> listscenes = (Dictionary<string, Scene>) bresult.resultobject;
                         foreach(KeyValuePair<string,Scene> kvp in listscenes)
                         {
-                            WriteMessageToConsole(string.Format("[ID]={0}, Name={1}, MembersID=[{2}]", kvp.Key, kvp.Value.name, string.Join(",", kvp.Value.lights)));
+                            WriteMessageToConsole(
+                                $"[ID]={kvp.Key}, Name={kvp.Value.name}, MembersID=[{string.Join(",", kvp.Value.lights)}]");
                         } 
                     }               
                     else
                     {
-                        WriteMessageToConsole("An error occured while fetching the list of scenes.");
+                        WriteMessageToConsole("An error occured while fetching the list of scenes : " + bresult.resultobject);
                     }
                 }},
                 {"lc", "List the schedules available in the bridge", delegate(string v)
                 {
-                    Dictionary<string, Schedule> listscenes = bridge.GetScheduleList();
-                    if(listscenes != null)
-                    { 
+                    CommandResult bresult = bridge.GetListObjects<Schedule>();
+                    if(bresult.Success)
+                    {
+                        Dictionary<string, Schedule> listscenes = (Dictionary<string, Schedule>)bresult.resultobject;
                         foreach(KeyValuePair<string,Schedule> kvp in listscenes)
                         {
-                            WriteMessageToConsole(string.Format("[ID]={0}, Name={1}, Time={2}", kvp.Key, kvp.Value.name, kvp.Value.localtime));
+                            WriteMessageToConsole($"[ID]={kvp.Key}, Name={kvp.Value.name}, Time={kvp.Value.localtime}");
                         } 
                     }               
                     else
                     {
-                        WriteMessageToConsole("An error occured while fetching the list of schedules.");
+                        WriteMessageToConsole("An error occured while fetching the list of schedules : " + bresult.resultobject);
                     }
                 }},
                 {"lo", "List the sensors available in the bridge", delegate(string v)
                 {
-                    Dictionary<string, Sensor> listsensors = bridge.GetSensorList();
-                    if(listsensors != null)
-                    { 
+                    CommandResult bresult = bridge.GetListObjects<Sensor>();
+                    
+                    if(bresult.Success)
+                    {
+                        Dictionary<string, Sensor> listsensors = (Dictionary<string, Sensor>) bresult.resultobject;
                         foreach(KeyValuePair<string,Sensor> kvp in listsensors)
                         {
-                            WriteMessageToConsole(string.Format("[ID]={0}, Name={1}, Type={2}, Model={3}, SwVersion={4}, Manufacturer={5}", kvp.Key, kvp.Value.name, kvp.Value.type, kvp.Value.modelid, kvp.Value.swversion, kvp.Value.manufacturername));
+                            WriteMessageToConsole(
+                                $"[ID]={kvp.Key}, Name={kvp.Value.name}, Type={kvp.Value.type}, Model={kvp.Value.modelid}, SwVersion={kvp.Value.swversion}, Manufacturer={kvp.Value.manufacturername}");
                         } 
                     }               
                     else
                     {
-                        WriteMessageToConsole("An error occured while fetching the list of sensors.");
+                        WriteMessageToConsole("An error occured while fetching the list of sensors : " + bresult.resultobject);
                     }
                 }},
                 {"lr", "List the rules available in the bridge", delegate(string v)
                 {
-                    Dictionary<string, Rule> listrules = bridge.GetRulesList();
-                    if(listrules != null)
-                    { 
-                        foreach(KeyValuePair<string, Rule> kvp in listrules)
+                    CommandResult bresult = bridge.GetListObjects<HueLib2.Rule>();
+
+                    if(bresult.Success)
+                    {
+                        Dictionary<string, HueLib2.Rule> listrules = (Dictionary<string, HueLib2.Rule>) bresult.resultobject;
+                        foreach(KeyValuePair<string, HueLib2.Rule> kvp in listrules)
                         {
-                            WriteMessageToConsole(string.Format("[ID]={0}, Name={1}, Owner={2}, Status={3}, TimesTriggered={4}", kvp.Key, kvp.Value.name, kvp.Value.owner, kvp.Value.status, kvp.Value.timestriggered));
+                            WriteMessageToConsole(
+                                $"[ID]={kvp.Key}, Name={kvp.Value.name}, Owner={kvp.Value.owner}, Status={kvp.Value.status}, TimesTriggered={kvp.Value.timestriggered}");
                         } 
                     }               
                     else
                     {
-                        WriteMessageToConsole("An error occured while fetching the list of rules.");
+                        WriteMessageToConsole("An error occured while fetching the list of rules : " + bresult.resultobject);
                     }
                 }},
                 {"lightstate=","Get the state of a light", delegate(string v)
                 {
                     byte value = 0;
                     bool isValidid = byte.TryParse(v,out value);
-
+                    
                     if (isValidid && v != "0")
                     {
-                        Light light = bridge.GetLight(v);
-                        WriteMessageToConsole(@light?.state.ToString() ?? bridge.lastMessages.ToString());
+                        CommandResult bresult = bridge.GetObject<Light>(v);
+                        if (bresult.Success)
+                        {
+                            Light light = (Light) bresult.resultobject;
+                            WriteMessageToConsole(@light.state.ToString() ?? bridge.lastMessages.ToString());
+
+                        }
+                        else
+                        {
+                            WriteMessageToConsole("Error getting the light : " + bresult.resultobject);
+                        }
                     }
                     else
                     {
@@ -313,8 +337,17 @@ static ConsoleHandler()
 
                     if (isValidid)
                     {
-                        Group group = bridge.GetGroup(v);
-                        WriteMessageToConsole(@group?.action.ToString() ?? bridge.lastMessages.ToString());
+                        CommandResult bresult = bridge.GetObject<Group>(v);
+                        if (bresult.Success)
+                        {
+                            Group group = (Group) bresult.resultobject;
+                            WriteMessageToConsole(@group.action.ToString());
+
+                        }
+                        else
+                        {
+                            WriteMessageToConsole("Error getting group : " + bresult.resultobject);
+                        }
                     }
                     else
                     {
@@ -384,14 +417,23 @@ static ConsoleHandler()
                 {
                     if(v == null)
                     {
-                        Light light = bridge.GetLight(id);
-                        if(light.state.@on != null && (bool)light.state.@on)
+                        CommandResult bresult = bridge.GetObject<Light>(id);
+                        
+                        if (bresult.Success)
                         {
-                            state.on = false;
+                            Light light = (Light) bresult.resultobject;
+                            if(light.state.@on != null && (bool)light.state.@on)
+                            {
+                                state.on = false;
+                            }
+                            else
+                            {
+                                state.on = true;
+                            }
                         }
                         else
                         {
-                            state.on = true;
+                            WriteMessageToConsole("Error getting light " + bresult.resultobject);
                         }
                     }
                     else
@@ -539,14 +581,23 @@ static ConsoleHandler()
                 {
                     if(v == null)
                     {
-                        Group group = bridge.GetGroup(id);
-                        if(@group.action.@on != null && (bool)@group.action.@on)
+                        CommandResult bresult = bridge.GetObject<Group>(id);
+                        if (bresult.Success)
                         {
-                            action.on = false;
+                            Group group = (Group) bresult.resultobject;
+                            if(@group.action.@on != null && (bool)@group.action.@on)
+                            {
+                                action.on = false;
+                            }
+                            else
+                            {
+                                action.on = true;
+                            }
+
                         }
                         else
                         {
-                            action.on = true;
+                            WriteMessageToConsole("Error getting group : " + bresult.resultobject);
                         }
                     }
                     else
@@ -878,7 +929,8 @@ private static void CreateGroup()
         {
             if (grp.name != null && grp.lights != null)
             {
-                if(bridge.CreateGroup(grp.name, grp.lights) != 0)
+                CommandResult bresult = bridge.CreateObject<Group>(grp);
+                if(bresult.Success)
                 {
                     WriteMessageToConsole("Groupe named " + grp.name + " created succesfully");                    
                 }
@@ -889,8 +941,9 @@ private static void CreateGroup()
 
         private static void SetGroupAction()
         {
-            bridge.SetGroupAction(id, action); ; 
-            if (bridge.lastMessages.FailureCount > 0 || error == true)
+            CommandResult bresult = bridge.SetState<Group>(action, id);
+            
+            if (!bresult.Success || error)
             {
                 WriteMessageToConsole("An error occured while sending the group state to the bridge.");
             }
@@ -937,8 +990,9 @@ private static void WriteMessagesToConsole(object sender, EventArgs e)
 
         private static void SetLightState()
         {
-            bridge.SetLightState(id, state);  
-            if (bridge.lastMessages.FailureCount > 0 || error)
+            CommandResult bresult = bridge.SetState<Light>(state, id);
+            
+            if (!bresult.Success || error)
             {
                 Console.WriteLine(@"An error occured while sending the light state to the bridge.");
                 Console.WriteLine(bridge.lastMessages);
@@ -949,8 +1003,9 @@ private static void SetLightState()
 
         private static void SetSensorState()
         {
-            bridge.SetSensorFlag(id, sensorstate);
-            if (bridge.lastMessages.FailureCount > 0 || error)
+            CommandResult bresult = bridge.ChangeSensorState(id, sensorstate);
+            
+            if (!bresult.Success || error)
             {
                 Console.WriteLine(@"An error occured while sending the sensor state to the bridge.");
                 Console.WriteLine(bridge.lastMessages);
diff --git a/whc/whc.csproj b/whc/whc.csproj
index 88d8aff5..b83fe736 100644
--- a/whc/whc.csproj
+++ b/whc/whc.csproj
@@ -36,6 +36,10 @@
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HueLib2, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\HueLib2\bin\Debug\HueLib2.dll</HintPath>
+    </Reference>
     <Reference Include="NDesk.Options">
       <HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>