diff --git a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml
index f530997..bb92e5d 100644
--- a/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml
+++ b/DataCenter_Windows/WindowsDataCenter/FlexiTimeSystemInstaller/Theme.xml
@@ -15,15 +15,16 @@
     <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
   </Page>
   <Page Name="Install">
-    <Text Name="InstCardSvcLbl" X="20" Y="80" Width="200" Height="17" TabStop="yes" FontId="3">Install Card Service</Text>
+    <Text Name="InstCardSvcLbl" X="20" Y="80" Width="200" Height="17" TabStop="no" FontId="3">Install Card Service</Text>
     <Checkbox Name="InstallCardService" X="230" Y="80" Width="200" Height="17" TabStop="yes" FontId="3"></Checkbox>
-    <Text Name="InstDataCntrSvcLbl" X="20" Y="110" Width="200" Height="17" TabStop="yes" FontId="3">Install Data Centre</Text>
+    <Text Name="InstDataCntrSvcLbl" X="20" Y="110" Width="200" Height="17" TabStop="no" FontId="3">Install Data Centre</Text>
     <Checkbox Name="InstallDataCenter" X="230" Y="110" Width="200" Height="17" TabStop="yes" FontId="3"></Checkbox>
-    <Text Name="DataCenterIPLbl" X="20" Y="140" Width="200" Height="17" TabStop="yes" FontId="3">Data Centre IP Address</Text>
+    <Text Name="DataCenterIPLbl" X="20" Y="140" Width="200" Height="17" TabStop="no" FontId="3">Data Centre IP Address</Text>
     <Editbox Name="DataServiceIpAddress" X="230" Y="140" Width="100" Height="17" TabStop="yes" FontId="3"></Editbox>
-    <Text Name="PortLabel" X="20" Y="170" Width="200" Height="17" TabStop="yes" FontId="3">Data Centre Website Port</Text>
+    <Text Name="PortLabel" X="20" Y="170" Width="200" Height="17" TabStop="no" FontId="3">Data Centre Website Port</Text>
     <Editbox Name="DataServicePort" X="230" Y="170" Width="100" Height="17" TabStop="yes" FontId="3"></Editbox>
-    <Button Name="InstallSQLiteDatabase" X="20" Y="200" Width="100" Height="23" TabStop="yes" FontId="0" HexStyle="000009">SQLite</Button>
+    <Text Name="DatabaseLabel" X="20" Y="200" Width="100" Height="17" TabStop="no" FontId="3">Database Type</Text>
+    <Button Name="InstallSQLiteDatabase" X="230" Y="200" Width="100" Height="23" TabStop="yes" FontId="0" HexStyle="000009">SQLite</Button>
     <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.InstallOptionsButton)</Button>
     <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
     <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>