diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs
index f5a1056..845d556 100644
--- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/DataCenterServiceComponents.wxs
@@ -1,217 +1,247 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-	<Fragment>
-    <PropertyRef Id="STARTSERVICEONINSTALL"/>
-    
-    <ComponentGroup Id="DataCenterComponents">
-      <ComponentRef Id="URLReservation"/>
-      <ComponentRef Id="DataCenterFirewallConfig"/>
-      <ComponentGroupRef Id="DataCenterFileGroup"/>
-      <ComponentRef Id="ServiceConfiguration"/>
-    </ComponentGroup>
-    
-    <ComponentGroup Id="DataCenterFileGroup" Directory="INSTALLFOLDER">
-      <Component Id="MicrosoftOwin" Guid="{45563976-8620-4447-9DFE-216DEF263D5A}">
-        <File Id="Microsoft.Owin.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)\Microsoft.Owin.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="MicrosoftOwinFileSystems" Guid="{45B6E4C5-FDD3-4B59-84A3-C58C8626BF61}">
-        <File Id="Microsoft.Owin.FileSystems.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Owin.FileSystems.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="MicrosoftOwinHostHttpListener" Guid="{5C9206E7-8C1B-4713-BE3B-8E754172ABE5}">
-        <File Id="Microsoft.Owin.Host.HttpListener.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Owin.Host.HttpListener.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="MicrosoftOwinHosting" Guid="{1A250453-173F-4FC6-BD72-5E3B3A67569B}">
-        <File Id="Microsoft.Owin.Hosting.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Owin.Hosting.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="MicrosoftOwinStaticFiles" Guid="{8F6B1D17-8D7C-4320-8BF6-26D6B3C5115E}">
-        <File Id="Microsoft.Owin.StaticFiles.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Owin.StaticFiles.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="MicrosoftWebInsfrastructure" Guid="{BCBEE2B7-3E75-4744-8B95-5928E69A8807}">
-        <File Id="Microsoft.Web.Infrastructure.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Web.Infrastructure.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NewtonsoftJson" Guid="{972634F3-DEC1-41D9-B48E-3836D6C1FD1D}">
-        <File Id="Newtonsoft.Json.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Newtonsoft.Json.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="Ninject" Guid="{31D0E89E-F1F7-4B7D-84E9-229D5C7042B5}">
-        <File Id="Ninject.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Ninject.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NinjectExtensionsContextPreservationDll" Guid="{580EAE73-1DBF-4F79-9153-8D5055C3A31F}">
-        <File Id="Ninject.Extensions.ContextPreservation.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.ContextPreservation.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NinjectExtensionsNamedScopeDll" Guid="{76602BE7-8A83-4BC2-AAA3-2A06F82353F0}">
-        <File Id="Ninject.Extensions.NamedScope.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.NamedScope.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NinjectExtensionsXmlDll" Guid="{3809511F-9C51-4C05-AFE5-F59160EDCB71}">
-        <File Id="Ninject.Extensions.Xml.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.Xml.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NinjectWebCommon" Guid="{A4D175A1-D68C-4E20-9E52-A0A8052B9E1D}">
-        <File Id="Ninject.Web.Common.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.Common.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NinjectWebCommonOwinHost" Guid="{156FF6D0-00DA-46BC-80C9-816F2CA8975E}">
-        <File Id="Ninject.Web.Common.OwinHost.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.Common.OwinHost.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NinjectWebWebApi" Guid="{20D06854-C822-4780-8EDC-D1601A835626}">
-        <File Id="Ninject.Web.WebApi.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.WebApi.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NinjectWebWebApiOwinHost" Guid="{024E48A9-CFAA-4AE1-9B55-399AC27E93B0}">
-        <File Id="Ninject.Web.WebApi.OwinHost.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.WebApi.OwinHost.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NinjectConfig" Guid="{85F6271F-7251-4E88-B44D-8EBDA4CBD29D}">
-        <File Id="NinjectConfig.xml"
-              Source="$(var.WindowsDataCenter.TargetDir)NinjectConfig.xml"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="Owin" Guid="{B4A90231-65AB-40F1-BEEC-EE02B9DBD4EC}">
-        <File Id="Owin.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)Owin.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="RazorEngine" Guid="{494124DC-1BD1-42C2-A249-53757289AAA4}">
-        <File Id="RazorEngine.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)RazorEngine.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SystemNetHttpFormatting" Guid="{53AB40B1-7A74-4B6B-9F0E-B1A74EE27467}">
-        <File Id="System.Net.Http.Formatting.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)System.Net.Http.Formatting.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SystemWebHttp" Guid="{B94609B3-B65E-4FB5-B226-B831D8597A9B}">
-        <File Id="System.Web.Http.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)System.Web.Http.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SystemWebHttpOwin" Guid="{99FF5381-765A-4B03-8668-1083ED498CAB}">
-        <File Id="System.Web.Http.Owin.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)System.Web.Http.Owin.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SystemWebHttpWebHost" Guid="{29E7462F-32C3-46E2-8295-FBF561D37E40}">
-        <File Id="System.Web.Http.WebHost.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)System.Web.Http.WebHost.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="WebActivatorEx" Guid="{7AD6A619-5946-4E94-AAD3-1AEEB88272C0}">
-        <File Id="WebActivatorEx.dll"
-              Source="$(var.WindowsDataCenter.TargetDir)WebActivatorEx.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="WindowsDataCenter" Guid="{CD36814E-8C1B-4AC1-BDC7-D1595D2A4728}">
-        <File Id="WindowsDataCenter.exe"
-              Source="$(var.WindowsDataCenter.TargetDir)WindowsDataCenter.exe"
-              KeyPath="yes"/>
-        <ServiceInstall Id="DataCenterService"
-                        Start="auto"
-                        ErrorControl="normal"
-                        Type="ownProcess"
-                        Vital="yes"
-                        Name="FlexitimeDataCenterService"
-                        DisplayName="FlexitimeDataCenterService"
-                        Description="Flexitime API Database and Website"
-                        Account="LocalSystem">
-          <util:PermissionEx  User="Everyone" 
-                              ServicePauseContinue="yes" 
-                              ServiceQueryStatus="yes"
-                              ServiceStart="yes" 
-                              ServiceStop="yes" 
-                              ServiceUserDefinedControl="yes"  />
-          <ServiceConfig Id="FlexiTimeServiceConfig"
-                         OnInstall="yes"
-                         DelayedAutoStart="0" />
-          <util:ServiceConfig FirstFailureActionType="restart"
-                              SecondFailureActionType="restart"
-                              ThirdFailureActionType="restart"
-                              ResetPeriodInDays="1"
-                              RestartServiceDelayInSeconds="10" />
-        </ServiceInstall>
-      </Component>
-      <Component Id="StartDataCenterServiceOnInsall" 
-                 Guid="{884828DC-A47E-4CEF-AEEB-E46FFDFFBED3}"
-                 KeyPath="yes">
-        <ServiceControl Id="FlexitimeDataCenterStarter"
-                        Start="install"
-                        Stop="uninstall"
-                        Remove="uninstall"
-                        Name="FlexitimeDataCenterService"
-                        Wait="yes"/>
-        <Condition><![CDATA[STARTSERVICEONINSTALL <> "false"]]></Condition>
-      </Component>
-      <Component Id="WindowsDataCenterExeConfig" Guid="{CBFA53EB-0663-4A79-9990-451FC1105A12}">
-        <File Id="WindowsDataCenter.exe.config"
-              Source="$(var.WindowsDataCenter.TargetDir)WindowsDataCenter.exe.config"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="WindowsDataCenterXml" Guid="{35A62230-0052-4EBE-9775-DE0266BADB4E}">
-        <File Id="WindowsDataCenter.xml"
-              Source="$(var.WindowsDataCenter.TargetDir)WindowsDataCenter.XML"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="ServiceConfiguration" Directory="INSTALLFOLDER" Guid="{E49ABD61-0CCA-45A2-A525-DF85A0493FF7}" KeyPath="yes">
-      <util:XmlFile Id="SetServicePort"
-                Action="setValue"
-                ElementPath="//appSettings/add[\[]@key='WebsiteHttpPort'[\]]/@value"
-                Value="[SERVICEPORT]"
-                File="[#WindowsDataCenter.exe.config]"
-                SelectionLanguage="XPath"
-                Sequence="1" />
-    </Component>
-  </Fragment>
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+	<Fragment>
+    <PropertyRef Id="STARTSERVICEONINSTALL"/>
+    
+    <ComponentGroup Id="DataCenterComponents">
+      <ComponentRef Id="URLReservation"/>
+      <ComponentRef Id="DataCenterFirewallConfig"/>
+      <ComponentGroupRef Id="DataCenterFileGroup"/>
+      <ComponentRef Id="ServiceConfiguration"/>
+    </ComponentGroup>
+    
+    <ComponentGroup Id="DataCenterFileGroup" Directory="INSTALLFOLDER">
+      <Component Id="CastleCore" Guid="{1B3813B5-C09B-47FB-85C7-6D3F37CADD8C}">
+        <File Id="Castle.Core.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)\Castle.Core.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="MicrosoftOwin" Guid="{45563976-8620-4447-9DFE-216DEF263D5A}">
+        <File Id="Microsoft.Owin.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)\Microsoft.Owin.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="MicrosoftOwinFileSystems" Guid="{45B6E4C5-FDD3-4B59-84A3-C58C8626BF61}">
+        <File Id="Microsoft.Owin.FileSystems.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Owin.FileSystems.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="MicrosoftOwinHostHttpListener" Guid="{5C9206E7-8C1B-4713-BE3B-8E754172ABE5}">
+        <File Id="Microsoft.Owin.Host.HttpListener.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Owin.Host.HttpListener.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="MicrosoftOwinHosting" Guid="{1A250453-173F-4FC6-BD72-5E3B3A67569B}">
+        <File Id="Microsoft.Owin.Hosting.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Owin.Hosting.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="MicrosoftOwinStaticFiles" Guid="{8F6B1D17-8D7C-4320-8BF6-26D6B3C5115E}">
+        <File Id="Microsoft.Owin.StaticFiles.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Owin.StaticFiles.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="MicrosoftWebInsfrastructure" Guid="{BCBEE2B7-3E75-4744-8B95-5928E69A8807}">
+        <File Id="Microsoft.Web.Infrastructure.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Microsoft.Web.Infrastructure.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NewtonsoftJson" Guid="{972634F3-DEC1-41D9-B48E-3836D6C1FD1D}">
+        <File Id="Newtonsoft.Json.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Newtonsoft.Json.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="Ninject" Guid="{31D0E89E-F1F7-4B7D-84E9-229D5C7042B5}">
+        <File Id="Ninject.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectExtensionsContextPreservationDll" Guid="{580EAE73-1DBF-4F79-9153-8D5055C3A31F}">
+        <File Id="Ninject.Extensions.ContextPreservation.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.ContextPreservation.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectExtensionsFactory" Guid="{AA81AB6B-A980-4CF5-AC4D-E5E80ECD52C7}">
+        <File Id="Ninject.Extensions.Factory.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.Factory.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectExtensionsNamedScopeDll" Guid="{76602BE7-8A83-4BC2-AAA3-2A06F82353F0}">
+        <File Id="Ninject.Extensions.NamedScope.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.NamedScope.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectExtensionsXmlDll" Guid="{3809511F-9C51-4C05-AFE5-F59160EDCB71}">
+        <File Id="Ninject.Extensions.Xml.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Extensions.Xml.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectWebCommon" Guid="{A4D175A1-D68C-4E20-9E52-A0A8052B9E1D}">
+        <File Id="Ninject.Web.Common.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.Common.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectWebCommonOwinHost" Guid="{156FF6D0-00DA-46BC-80C9-816F2CA8975E}">
+        <File Id="Ninject.Web.Common.OwinHost.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.Common.OwinHost.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectWebCommonWebHost" Guid="{595CDF8D-3728-4342-BFD9-34AD23294C6C}">
+        <File Id="Ninject.Web.Common.Web.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.Common.WebHost.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectWebWebApi" Guid="{20D06854-C822-4780-8EDC-D1601A835626}">
+        <File Id="Ninject.Web.WebApi.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.WebApi.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectWebWebApiOwinHost" Guid="{024E48A9-CFAA-4AE1-9B55-399AC27E93B0}">
+        <File Id="Ninject.Web.WebApi.OwinHost.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Ninject.Web.WebApi.OwinHost.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NinjectConfig" Guid="{85F6271F-7251-4E88-B44D-8EBDA4CBD29D}">
+        <File Id="NinjectConfig.xml"
+              Source="$(var.WindowsDataCenter.TargetDir)NinjectConfig.xml"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="Owin" Guid="{B4A90231-65AB-40F1-BEEC-EE02B9DBD4EC}">
+        <File Id="Owin.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)Owin.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="RazorEngine" Guid="{494124DC-1BD1-42C2-A249-53757289AAA4}">
+        <File Id="RazorEngine.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)RazorEngine.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SystemDataSQLite" Guid="{C56CC08B-BCC5-494E-9E48-3E01402FFF97}">
+        <File Id="System.Data.SQLite.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)System.Data.SQLite.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SystemNetHttpFormatting" Guid="{53AB40B1-7A74-4B6B-9F0E-B1A74EE27467}">
+        <File Id="System.Net.Http.Formatting.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)System.Net.Http.Formatting.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SystemWebHttp" Guid="{B94609B3-B65E-4FB5-B226-B831D8597A9B}">
+        <File Id="System.Web.Http.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)System.Web.Http.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SystemWebHttpOwin" Guid="{99FF5381-765A-4B03-8668-1083ED498CAB}">
+        <File Id="System.Web.Http.Owin.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)System.Web.Http.Owin.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SystemWebHttpWebHost" Guid="{29E7462F-32C3-46E2-8295-FBF561D37E40}">
+        <File Id="System.Web.Http.WebHost.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)System.Web.Http.WebHost.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SystemWebRazor" Guid="{EB7F6B70-F224-4FD7-93DF-138CC06F01CB}">
+        <File Id="System.Web.Razor.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)System.Web.Razor.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="WebActivatorEx" Guid="{7AD6A619-5946-4E94-AAD3-1AEEB88272C0}">
+        <File Id="WebActivatorEx.dll"
+              Source="$(var.WindowsDataCenter.TargetDir)WebActivatorEx.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="WindowsDataCenter" Guid="{CD36814E-8C1B-4AC1-BDC7-D1595D2A4728}">
+        <File Id="WindowsDataCenter.exe"
+              Source="$(var.WindowsDataCenter.TargetDir)WindowsDataCenter.exe"
+              KeyPath="yes"/>
+        <ServiceInstall Id="DataCenterService"
+                        Start="auto"
+                        ErrorControl="normal"
+                        Type="ownProcess"
+                        Vital="yes"
+                        Name="FlexitimeDataCenterService"
+                        DisplayName="FlexitimeDataCenterService"
+                        Description="Flexitime API Database and Website"
+                        Account="LocalSystem">
+          <util:PermissionEx  User="Everyone" 
+                              ServicePauseContinue="yes" 
+                              ServiceQueryStatus="yes"
+                              ServiceStart="yes" 
+                              ServiceStop="yes" 
+                              ServiceUserDefinedControl="yes"  />
+          <ServiceConfig Id="FlexiTimeServiceConfig"
+                         OnInstall="yes"
+                         DelayedAutoStart="0" />
+          <util:ServiceConfig FirstFailureActionType="restart"
+                              SecondFailureActionType="restart"
+                              ThirdFailureActionType="restart"
+                              ResetPeriodInDays="1"
+                              RestartServiceDelayInSeconds="10" />
+        </ServiceInstall>
+      </Component>
+      <Component Id="StartDataCenterServiceOnInsall" 
+                 Guid="{884828DC-A47E-4CEF-AEEB-E46FFDFFBED3}"
+                 KeyPath="yes">
+        <ServiceControl Id="FlexitimeDataCenterStarter"
+                        Start="install"
+                        Stop="uninstall"
+                        Remove="uninstall"
+                        Name="FlexitimeDataCenterService"
+                        Wait="yes"/>
+        <Condition><![CDATA[STARTSERVICEONINSTALL <> "false"]]></Condition>
+      </Component>
+      <Component Id="WindowsDataCenterExeConfig" Guid="{CBFA53EB-0663-4A79-9990-451FC1105A12}">
+        <File Id="WindowsDataCenter.exe.config"
+              Source="$(var.WindowsDataCenter.TargetDir)WindowsDataCenter.exe.config"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="WindowsDataCenterXml" Guid="{35A62230-0052-4EBE-9775-DE0266BADB4E}">
+        <File Id="WindowsDataCenter.xml"
+              Source="$(var.WindowsDataCenter.TargetDir)WindowsDataCenter.XML"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+    </ComponentGroup>
+
+    <Component Id="ServiceConfiguration" Directory="INSTALLFOLDER" Guid="{E49ABD61-0CCA-45A2-A525-DF85A0493FF7}" KeyPath="yes">
+      <util:XmlFile Id="SetServicePort"
+                Action="setValue"
+                ElementPath="//appSettings/add[\[]@key='WebsiteHttpPort'[\]]/@value"
+                Value="[SERVICEPORT]"
+                File="[#WindowsDataCenter.exe.config]"
+                SelectionLanguage="XPath"
+                Sequence="1" />
+    </Component>
+  </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/NLog.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/NLog.wxs
index fc9d25a..70e828b 100644
--- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/NLog.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/NLog.wxs
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment>
-    <ComponentGroup Id="NLogComponents">
-      <ComponentGroupRef Id="NLoggerGroup"/>
-      <ComponentGroupRef Id="NLogConfigFiles"/>
-    </ComponentGroup>
-
-    <ComponentGroup Id="NLoggerGroup" Directory="INSTALLFOLDER">
-      <Component Id="NLoggerDll" Guid="{48765F51-86CA-4AD8-A34E-E4705353E101}">
-        <File Id="NLogLoggerDll"
-              Source="$(var.NLogLogger.TargetDir)\NLogLogger.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NLogDll" Guid="{D9D15A6F-9602-4B6B-BB76-AD0768D14780}">
-        <File Id="NLog.dll"
-              Source="$(var.NLogLogger.TargetDir)\NLog.dll"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="NLogLoggerDllConfig" Guid="{E3808BFF-5156-4123-B108-BECD0A5A99BC}">
-        <File Id="NLogLoggerDllConfig"
-              Source="$(var.NLogLogger.TargetDir)\NLogLogger.dll.config"
-              KeyPath="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="NLogConfigFiles" Directory="CONFIGFILES">
-      <Component Id="NLogConfigFile" Guid="{DE1F65F2-C286-4495-984C-9BF5861A0567}">
-        <File Id="NLogConfigXml"
-              Source="$(var.NLogLogger.TargetDir)\NLogConfig.xml"
-              KeyPath="yes" />
-      </Component>
-    </ComponentGroup>
-	</Fragment>
-</Wix>
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+    <ComponentGroup Id="NLogComponents">
+      <ComponentGroupRef Id="NLoggerGroup"/>
+      <ComponentGroupRef Id="NLogConfigFiles"/>
+    </ComponentGroup>
+
+    <ComponentGroup Id="NLoggerGroup" Directory="INSTALLFOLDER">
+      <Component Id="NLoggerDll" Guid="{48765F51-86CA-4AD8-A34E-E4705353E101}">
+        <File Id="NLogLoggerDll"
+              Source="$(var.NLogLogger.TargetDir)\NLogLogger.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NLogDll" Guid="{D9D15A6F-9602-4B6B-BB76-AD0768D14780}">
+        <File Id="NLog.dll"
+              Source="$(var.NLogLogger.TargetDir)\NLog.dll"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="NLogLoggerDllConfig" Guid="{E3808BFF-5156-4123-B108-BECD0A5A99BC}">
+        <File Id="NLogLoggerDllConfig"
+              Source="$(var.NLogLogger.TargetDir)\NLogLogger.dll.config"
+              KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="NLogConfigFiles" Directory="CONFIGFILES">
+      <Component Id="NLogConfigFile" Guid="{DE1F65F2-C286-4495-984C-9BF5861A0567}">
+        <File Id="NLogConfigXml"
+              Source="$(var.NLogLogger.TargetDir)\NLogConfig.xml"
+              KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+	</Fragment>
+</Wix>
diff --git a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs
index 0d47858..6202591 100644
--- a/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs
+++ b/DataCenter_Windows/WindowsDataCenter/WebApiServerHostInstaller/WebPages.wxs
@@ -1,195 +1,231 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Fragment>
-
-    <DirectoryRef Id="INSTALLFOLDER">
-      <Directory Id="STATICWWW" Name="www" >
-        <Directory Id="STATICWWWCSS" Name="css"/>
-        <Directory Id="STATICWWWFONTS" Name="fonts" />
-        <Directory Id="STATICWWWJS" Name="js" />
-      </Directory>
-    </DirectoryRef>
-
-    <ComponentGroup Id="WebSiteComponents">
-      <ComponentGroupRef Id="WWWStaticFiles"/>
-      <ComponentGroupRef Id="WWWStaticJs"/>
-      <ComponentGroupRef Id="WWWStaticFonts"/>
-      <ComponentGroupRef Id="WWWStaticCss"/>
-    </ComponentGroup>
-    
-    <ComponentGroup Id="WWWStaticFiles" Directory="STATICWWW">
-      <Component Id="IndexHtml" Guid="{418BCB07-AB9B-4A67-AB31-E9378B806A2E}">
-        <File Id="index.html"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\index.html"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="AdminHtml" Guid="{3094817F-74B4-4848-A882-7FDC6B401D86}">
-        <File Id="admin.html"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\admin.html"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SpaCss" Guid="{A5998F36-2CD9-4EB3-A008-12AE1018F153}">
-        <File Id="spa.css"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\spa.css"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SpaMinCss" Guid="{668AC0CC-8139-4B87-8507-44FC83F6FE07}">
-        <File Id="spa.min.css"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\spa.min.css"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SpaJs" Guid="{0A669ADE-9804-4C2A-9970-BF7EFE52F003}">
-        <File Id="spa.js"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\spa.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="SpaMinJs" Guid="{5B29F7F4-F805-4066-8F65-848119AD5EFD}">
-        <File Id="spa.min.js"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\spa.min.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="AdminJs" Guid="{B529C781-4AE7-48F1-A2E7-6987A37BD225}">
-        <File Id="admin.js"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\admin.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="AdminMinJs" Guid="{1AEBE106-FA98-45E6-B2ED-69806BF9AAFE}">
-        <File Id="admin.min.js"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\admin.min.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="HelpersJs" Guid="{4C8A424D-023E-4311-B100-5BA5AA7DFBAD}">
-        <File Id="Helpers.js"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\Helpers.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="HelpersMinJs" Guid="{42142DE2-3952-4B14-A64A-12D67DD657C4}">
-        <File Id="Helpers.min.js"
-              Source="$(var.WindowsDataCenter.TargetDir)\www\Helpers.min.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="WWWStaticJs" Directory="STATICWWWJS">
-      <Component Id="BootstrapJs" Guid="{DF7034BA-B315-4AB5-983A-6470D773DF27}">
-        <File Id="Bootstrap.js"
-              Source="$(var.WindowsDataCenter.TargetDir)www\js\bootstrap.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="BootstrapMinJs" Guid="{48C14202-7096-4FCA-91BA-7BB24F0D5C22}">
-        <File Id="Bootstrap.min.js"
-              Source="$(var.WindowsDataCenter.TargetDir)www\js\bootstrap.min.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="KnockoutContextMenuJs" Guid="{C48C75F7-E4C3-45D7-8041-0BF7A8EEC077}">
-        <File Id="knockout.contextmenu.js"
-              Source="$(var.WindowsDataCenter.TargetDir)www\js\knockout.contextmenu.js"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="WWWStaticFonts" Directory="STATICWWWFONTS" >
-      <Component Id="GlyphiconsHalflingsRegular" Guid="{AB0C30AC-B19F-4CC1-BE18-6C83BDD16950}">
-        <File Id="Glyphicons_Halflings_RegularEot"
-              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.eot"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="GlyphiconsHalflingsRegularSvg" Guid="{1B67BD41-8328-463C-AEB1-EAA5496D6086}">
-        <File Id="Glyphicons_Halflings_RegularSvg"
-              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.svg"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="GlyphiconsHalflingsRegularTtf" Guid="{F2B0B4D8-5809-4524-AFD5-9E25F04EA3AE}">
-        <File Id="Glyphicons_Halflings_RegularTtf"
-              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.ttf"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="GlyphiconsHalflingsRegularWoff" Guid="{5D644DF7-23C6-4B8B-9FCF-F6F9F0A1FFDC}">
-        <File Id="Glyphicons_Halflings_RegularWoff"
-              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.woff"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="GlyphiconsHalflingsRegularWoff2" Guid="{87EE2C7C-D6A6-424B-A30B-06E771406C71}">
-        <File Id="Glyphicons_Halflings_RegularWoff2"
-              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.woff2"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-    </ComponentGroup>
-    
-    <ComponentGroup Id="WWWStaticCss" Directory="STATICWWWCSS">
-      <Component Id="BootstrapCss" Guid="{EBB792CD-23B2-4806-B92B-CA4CD3293148}">
-        <File Id="bootstrap.css"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap.css"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="BootstrapCssMap" Guid="{6E7BEFA7-61F3-4740-96A2-9036F6ABF273}">
-        <File Id="bootstrap.css.map"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap.css.map"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="BootstrapMinCss" Guid="{10BBCC84-63EB-4B4A-816B-460888896A79}">
-        <File Id="bootstrap.min.css"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap.min.css"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="BootstrapMinCssMap" Guid="{909F1752-1472-48DD-99DA-116D391FB12B}">
-        <File Id="bootstrap.min.css.map"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap.min.css.map"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="BootstrapThemeCss" Guid="{0EA9E1E9-F077-4B75-A829-6CC93AF55684}">
-        <File Id="bootstrap_theme.css"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap-theme.css"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="BootstrapGridCssMap" Guid="{5732BF4E-5963-49BD-B466-D9D3CF0B137A}">
-        <File Id="bootstrap_theme.css.map"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap-theme.css.map"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="BootstrapThemeMinCss" Guid="{1281A9F1-28E0-4748-B9B4-8C8C68EDD9E5}">
-        <File Id="bootstrap_theme.min.css"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap-theme.min.css"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="BootstrapThemeMinCssMap" Guid="{F054150C-0E9A-4EB8-8EB2-B5BD81D004CE}">
-        <File Id="bootstrap_theme.min.css.map"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap-theme.min.css.map"
-              KeyPath="yes"
-              Checksum="yes"/>
-      </Component>
-      <Component Id="KnockoutContextMenuCss" Guid="{D5C5C0F3-500C-419C-A327-5342AFF08204}">
-        <File Id="knockout.contextmenu.css"
-              Source="$(var.WindowsDataCenter.TargetDir)www\css\knockout.contextmenu.css"
-              KeyPath="yes"
-              Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-    
-	</Fragment>
-</Wix>
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Fragment>
+
+    <DirectoryRef Id="INSTALLFOLDER">
+      <Directory Id="STATICWWW" Name="www" >
+        <Directory Id="STATICWWWCSS" Name="css"/>
+        <Directory Id="STATICWWWFONTS" Name="fonts" />
+        <Directory Id="STATICWWWJS" Name="js" />
+      </Directory>
+    </DirectoryRef>
+
+    <ComponentGroup Id="WebSiteComponents">
+      <ComponentGroupRef Id="WWWStaticFiles"/>
+      <ComponentGroupRef Id="WWWStaticJs"/>
+      <ComponentGroupRef Id="WWWStaticFonts"/>
+      <ComponentGroupRef Id="WWWStaticCss"/>
+    </ComponentGroup>
+    
+    <ComponentGroup Id="WWWStaticFiles" Directory="STATICWWW">
+      <Component Id="IndexHtml" Guid="{418BCB07-AB9B-4A67-AB31-E9378B806A2E}">
+        <File Id="index.html"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\index.html"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="AdminHtml" Guid="{3094817F-74B4-4848-A882-7FDC6B401D86}">
+        <File Id="admin.html"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\admin.html"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SpaCss" Guid="{A5998F36-2CD9-4EB3-A008-12AE1018F153}">
+        <File Id="spa.css"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\spa.css"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SpaMinCss" Guid="{668AC0CC-8139-4B87-8507-44FC83F6FE07}">
+        <File Id="spa.min.css"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\spa.min.css"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SpaJs" Guid="{0A669ADE-9804-4C2A-9970-BF7EFE52F003}">
+        <File Id="spa.js"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\spa.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="SpaMinJs" Guid="{5B29F7F4-F805-4066-8F65-848119AD5EFD}">
+        <File Id="spa.min.js"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\spa.min.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="AdminJs" Guid="{B529C781-4AE7-48F1-A2E7-6987A37BD225}">
+        <File Id="admin.js"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\admin.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="AdminMinJs" Guid="{1AEBE106-FA98-45E6-B2ED-69806BF9AAFE}">
+        <File Id="admin.min.js"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\admin.min.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="HelpersJs" Guid="{4C8A424D-023E-4311-B100-5BA5AA7DFBAD}">
+        <File Id="Helpers.js"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\Helpers.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="HelpersMinJs" Guid="{42142DE2-3952-4B14-A64A-12D67DD657C4}">
+        <File Id="Helpers.min.js"
+              Source="$(var.WindowsDataCenter.TargetDir)\www\Helpers.min.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="WWWStaticJs" Directory="STATICWWWJS">
+      <Component Id="BootstrapJs" Guid="{DF7034BA-B315-4AB5-983A-6470D773DF27}">
+        <File Id="Bootstrap.js"
+              Source="$(var.WindowsDataCenter.TargetDir)www\js\bootstrap.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="BootstrapMinJs" Guid="{48C14202-7096-4FCA-91BA-7BB24F0D5C22}">
+        <File Id="Bootstrap.min.js"
+              Source="$(var.WindowsDataCenter.TargetDir)www\js\bootstrap.min.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="KnockoutContextMenuJs" Guid="{C48C75F7-E4C3-45D7-8041-0BF7A8EEC077}">
+        <File Id="knockout.contextmenu.js"
+              Source="$(var.WindowsDataCenter.TargetDir)www\js\knockout.contextmenu.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="EasyMdeMinJs" Guid="{F5659507-81DF-4ACC-9996-7CBFEF0CBE26}">
+        <File Id="easymde.min.js"
+              Source="$(var.WindowsDataCenter.TargetDir)www\js\easymde.min.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="HtmlParserMinJs" Guid="{788487B1-CC7C-4E8B-93C0-B865CEA916DB}">
+        <File Id="htmlparser.min.js"
+              Source="$(var.WindowsDataCenter.TargetDir)www\js\htmlparser.min.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="MarkedMinJs" Guid="{4B70E7F7-A883-4BB5-9F34-85BA9C585741}">
+        <File Id="marked.min.js"
+              Source="$(var.WindowsDataCenter.TargetDir)www\js\marked.min.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="PolicyObject" Guid="{6A5A8235-33CA-460C-A721-7078DB51925F}">
+        <File Id="PolicyObject.Js"
+              Source="$(var.WindowsDataCenter.TargetDir)www\js\PolicyObject.js"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="WWWStaticFonts" Directory="STATICWWWFONTS" >
+      <Component Id="GlyphiconsHalflingsRegular" Guid="{AB0C30AC-B19F-4CC1-BE18-6C83BDD16950}">
+        <File Id="Glyphicons_Halflings_RegularEot"
+              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.eot"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="GlyphiconsHalflingsRegularSvg" Guid="{1B67BD41-8328-463C-AEB1-EAA5496D6086}">
+        <File Id="Glyphicons_Halflings_RegularSvg"
+              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.svg"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="GlyphiconsHalflingsRegularTtf" Guid="{F2B0B4D8-5809-4524-AFD5-9E25F04EA3AE}">
+        <File Id="Glyphicons_Halflings_RegularTtf"
+              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.ttf"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="GlyphiconsHalflingsRegularWoff" Guid="{5D644DF7-23C6-4B8B-9FCF-F6F9F0A1FFDC}">
+        <File Id="Glyphicons_Halflings_RegularWoff"
+              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.woff"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="GlyphiconsHalflingsRegularWoff2" Guid="{87EE2C7C-D6A6-424B-A30B-06E771406C71}">
+        <File Id="Glyphicons_Halflings_RegularWoff2"
+              Source="$(var.WindowsDataCenter.TargetDir)www\fonts\glyphicons-halflings-regular.woff2"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+    </ComponentGroup>
+    
+    <ComponentGroup Id="WWWStaticCss" Directory="STATICWWWCSS">
+      <Component Id="BootstrapCss" Guid="{EBB792CD-23B2-4806-B92B-CA4CD3293148}">
+        <File Id="bootstrap.css"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap.css"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="BootstrapCssMap" Guid="{6E7BEFA7-61F3-4740-96A2-9036F6ABF273}">
+        <File Id="bootstrap.css.map"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap.css.map"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="BootstrapMinCss" Guid="{10BBCC84-63EB-4B4A-816B-460888896A79}">
+        <File Id="bootstrap.min.css"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap.min.css"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="BootstrapMinCssMap" Guid="{909F1752-1472-48DD-99DA-116D391FB12B}">
+        <File Id="bootstrap.min.css.map"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap.min.css.map"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="BootstrapThemeCss" Guid="{0EA9E1E9-F077-4B75-A829-6CC93AF55684}">
+        <File Id="bootstrap_theme.css"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap-theme.css"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="BootstrapGridCssMap" Guid="{5732BF4E-5963-49BD-B466-D9D3CF0B137A}">
+        <File Id="bootstrap_theme.css.map"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap-theme.css.map"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="BootstrapThemeMinCss" Guid="{1281A9F1-28E0-4748-B9B4-8C8C68EDD9E5}">
+        <File Id="bootstrap_theme.min.css"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap-theme.min.css"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="BootstrapThemeMinCssMap" Guid="{F054150C-0E9A-4EB8-8EB2-B5BD81D004CE}">
+        <File Id="bootstrap_theme.min.css.map"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\bootstrap-theme.min.css.map"
+              KeyPath="yes"
+              Checksum="yes"/>
+      </Component>
+      <Component Id="KnockoutContextMenuCss" Guid="{D5C5C0F3-500C-419C-A327-5342AFF08204}">
+        <File Id="knockout.contextmenu.css"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\knockout.contextmenu.css"
+              KeyPath="yes"
+              Checksum="yes" />
+      </Component>
+      <Component Id="EasyMdeMinCss" Guid="{F84BEE5C-1682-4D1D-97F4-6A68D8090BA1}">
+        <File Id="easymde.min.css"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\easymde.min.css"
+              KeyPath="yes"
+              Checksum="yes" />
+      </Component>
+      <Component Id="HighlightjsMinCss" Guid="{F65BABFC-1EDB-4F60-807B-3BB23FE6E144}">
+        <File Id="highlightjs.min.css"
+              Source="$(var.WindowsDataCenter.TargetDir)www\css\highlightjs.min.css"
+              KeyPath="yes"
+              Checksum="yes" />
+      </Component>
+    </ComponentGroup>
+    
+	</Fragment>
+</Wix>
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Properties/AssemblyInfo.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Properties/AssemblyInfo.cs
index 0a37b05..ab5f814 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Properties/AssemblyInfo.cs
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.2.1.0")]
-[assembly: AssemblyFileVersion("0.2.1.0")]
+[assembly: AssemblyVersion("0.2.2.0")]
+[assembly: AssemblyFileVersion("0.2.2.0")]