diff --git a/SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs b/SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs
index 18027804..816da06b 100644
--- a/SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs
+++ b/SafeExamBrowser.Core/Notifications/LogNotificationIconResource.cs
@@ -13,7 +13,7 @@ namespace SafeExamBrowser.Core.Notifications
 {
 	class LogNotificationIconResource : IIconResource
 	{
-		public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface;component/Images/LogNotification.ico");
+		public Uri Uri => new Uri("pack://application:,,,/SafeExamBrowser.UserInterface.Windows10;component/Images/LogNotification.ico");
 		public bool IsBitmapResource => true;
 		public bool IsXamlResource => false;
 	}
diff --git a/SafeExamBrowser.UserInterface/AboutWindow.xaml b/SafeExamBrowser.UserInterface/AboutWindow.xaml
index f59c562b..6ab39955 100644
--- a/SafeExamBrowser.UserInterface/AboutWindow.xaml
+++ b/SafeExamBrowser.UserInterface/AboutWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="SafeExamBrowser.UserInterface.AboutWindow"
+<Window x:Class="SafeExamBrowser.UserInterface.Windows10.AboutWindow"
         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"
-        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface"
+        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10"
         mc:Ignorable="d"
         Title="About Safe Exam Browser" Height="350" Width="450" ResizeMode="NoResize" Icon="./Images/SafeExamBrowser.ico"
         ShowInTaskbar="False" WindowStartupLocation="CenterScreen">
@@ -19,7 +19,7 @@
             <ColumnDefinition />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <Image Grid.ColumnSpan="2" Source="pack://application:,,,/SafeExamBrowser.UserInterface;component/Images/SplashScreen.png" Margin="0,5,0,0" />
+        <Image Grid.ColumnSpan="2" Source="pack://application:,,,/SafeExamBrowser.UserInterface.Windows10;component/Images/SplashScreen.png" Margin="0,5,0,0" />
         <TextBlock x:Name="VersionInfo" Grid.Row="0" Grid.Column="1" Foreground="DarkGray" Margin="25,70,50,10" TextWrapping="Wrap" />
         <ScrollViewer Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" VerticalScrollBarVisibility="Auto">
             <TextBlock x:Name="MainText" Foreground="White" Margin="10" FontSize="10" TextWrapping="Wrap">
diff --git a/SafeExamBrowser.UserInterface/AboutWindow.xaml.cs b/SafeExamBrowser.UserInterface/AboutWindow.xaml.cs
index f88fa625..76172037 100644
--- a/SafeExamBrowser.UserInterface/AboutWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface/AboutWindow.xaml.cs
@@ -12,7 +12,7 @@ using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.UserInterface;
 
-namespace SafeExamBrowser.UserInterface
+namespace SafeExamBrowser.UserInterface.Windows10
 {
 	public partial class AboutWindow : Window, IWindow
 	{
diff --git a/SafeExamBrowser.UserInterface/BrowserWindow.xaml b/SafeExamBrowser.UserInterface/BrowserWindow.xaml
index 18fb1c70..d451e890 100644
--- a/SafeExamBrowser.UserInterface/BrowserWindow.xaml
+++ b/SafeExamBrowser.UserInterface/BrowserWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="SafeExamBrowser.UserInterface.BrowserWindow"
+<Window x:Class="SafeExamBrowser.UserInterface.Windows10.BrowserWindow"
         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"
-        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface"
+        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10"
         mc:Ignorable="d"
         Title="BrowserWindow" Height="500" Width="500" WindowState="Maximized" Icon=".\Images\Chromium.ico">
     <Grid>
diff --git a/SafeExamBrowser.UserInterface/BrowserWindow.xaml.cs b/SafeExamBrowser.UserInterface/BrowserWindow.xaml.cs
index 9c6ee1be..e02471ff 100644
--- a/SafeExamBrowser.UserInterface/BrowserWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface/BrowserWindow.xaml.cs
@@ -11,7 +11,7 @@ using System.Windows.Input;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.UserInterface;
 
-namespace SafeExamBrowser.UserInterface
+namespace SafeExamBrowser.UserInterface.Windows10
 {
 	public partial class BrowserWindow : Window, IBrowserWindow
 	{
diff --git a/SafeExamBrowser.UserInterface/Controls/ApplicationButton.xaml b/SafeExamBrowser.UserInterface/Controls/ApplicationButton.xaml
index 50ef9ceb..4569fd69 100644
--- a/SafeExamBrowser.UserInterface/Controls/ApplicationButton.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/ApplicationButton.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Controls.ApplicationButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Windows10.Controls.ApplicationButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
+             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10.Controls"
              xmlns:s="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="50">
     <UserControl.Resources>
diff --git a/SafeExamBrowser.UserInterface/Controls/ApplicationButton.xaml.cs b/SafeExamBrowser.UserInterface/Controls/ApplicationButton.xaml.cs
index abc76f43..1ad21fe3 100644
--- a/SafeExamBrowser.UserInterface/Controls/ApplicationButton.xaml.cs
+++ b/SafeExamBrowser.UserInterface/Controls/ApplicationButton.xaml.cs
@@ -14,9 +14,9 @@ using System.Windows.Controls;
 using System.Windows.Media;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
-using SafeExamBrowser.UserInterface.Utilities;
+using SafeExamBrowser.UserInterface.Windows10.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Controls
+namespace SafeExamBrowser.UserInterface.Windows10.Controls
 {
 	public partial class ApplicationButton : UserControl, IApplicationButton
 	{
diff --git a/SafeExamBrowser.UserInterface/Controls/ApplicationInstanceButton.xaml b/SafeExamBrowser.UserInterface/Controls/ApplicationInstanceButton.xaml
index dd2616a5..8da24d4a 100644
--- a/SafeExamBrowser.UserInterface/Controls/ApplicationInstanceButton.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/ApplicationInstanceButton.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Controls.ApplicationInstanceButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Windows10.Controls.ApplicationInstanceButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
+             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10.Controls"
              mc:Ignorable="d" d:DesignWidth="250">
     <Grid>
         <Button x:Name="Button" BorderThickness="0" Click="Button_Click" Height="25">
diff --git a/SafeExamBrowser.UserInterface/Controls/ApplicationInstanceButton.xaml.cs b/SafeExamBrowser.UserInterface/Controls/ApplicationInstanceButton.xaml.cs
index 8c130c28..0cb84f45 100644
--- a/SafeExamBrowser.UserInterface/Controls/ApplicationInstanceButton.xaml.cs
+++ b/SafeExamBrowser.UserInterface/Controls/ApplicationInstanceButton.xaml.cs
@@ -10,9 +10,9 @@ using System;
 using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.Contracts.Configuration;
-using SafeExamBrowser.UserInterface.Utilities;
+using SafeExamBrowser.UserInterface.Windows10.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Controls
+namespace SafeExamBrowser.UserInterface.Windows10.Controls
 {
 	internal delegate void InstanceButtonClickedEventHandler(Guid instanceId);
 
diff --git a/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml b/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml
index fe8a0920..08607fbd 100644
--- a/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Controls.DateTimeControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Windows10.Controls.DateTimeControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
+             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10.Controls"
              mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="75">
     <Button Background="#00000000" BorderThickness="0" ToolTip="{Binding Path=ToolTip}">
         <Button.Template>
diff --git a/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml.cs b/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml.cs
index 767b9df7..0082303e 100644
--- a/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml.cs
+++ b/SafeExamBrowser.UserInterface/Controls/DateTimeControl.xaml.cs
@@ -7,9 +7,9 @@
  */
 
 using System.Windows.Controls;
-using SafeExamBrowser.UserInterface.ViewModels;
+using SafeExamBrowser.UserInterface.Windows10.ViewModels;
 
-namespace SafeExamBrowser.UserInterface.Controls
+namespace SafeExamBrowser.UserInterface.Windows10.Controls
 {
 	public partial class DateTimeControl : UserControl
 	{
diff --git a/SafeExamBrowser.UserInterface/Controls/NotificationButton.xaml b/SafeExamBrowser.UserInterface/Controls/NotificationButton.xaml
index a8deeb95..077c821e 100644
--- a/SafeExamBrowser.UserInterface/Controls/NotificationButton.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/NotificationButton.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Controls.NotificationButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Windows10.Controls.NotificationButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
+             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10.Controls"
              mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="28">
     <UserControl.Resources>
         <ResourceDictionary>
diff --git a/SafeExamBrowser.UserInterface/Controls/NotificationButton.xaml.cs b/SafeExamBrowser.UserInterface/Controls/NotificationButton.xaml.cs
index 8086e753..978f0442 100644
--- a/SafeExamBrowser.UserInterface/Controls/NotificationButton.xaml.cs
+++ b/SafeExamBrowser.UserInterface/Controls/NotificationButton.xaml.cs
@@ -10,9 +10,9 @@ using System.Windows;
 using System.Windows.Controls;
 using SafeExamBrowser.Contracts.Configuration;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
-using SafeExamBrowser.UserInterface.Utilities;
+using SafeExamBrowser.UserInterface.Windows10.Utilities;
 
-namespace SafeExamBrowser.UserInterface.Controls
+namespace SafeExamBrowser.UserInterface.Windows10.Controls
 {
 	public partial class NotificationButton : UserControl, INotificationButton
 	{
diff --git a/SafeExamBrowser.UserInterface/Controls/PowerSupplyControl.xaml b/SafeExamBrowser.UserInterface/Controls/PowerSupplyControl.xaml
index 89a2ec09..f110d5ea 100644
--- a/SafeExamBrowser.UserInterface/Controls/PowerSupplyControl.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/PowerSupplyControl.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Controls.PowerSupplyControl"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Windows10.Controls.PowerSupplyControl"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
+             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10.Controls"
              mc:Ignorable="d" d:DesignHeight="40" d:DesignWidth="28">
     <UserControl.Resources>
         <ResourceDictionary>
diff --git a/SafeExamBrowser.UserInterface/Controls/PowerSupplyControl.xaml.cs b/SafeExamBrowser.UserInterface/Controls/PowerSupplyControl.xaml.cs
index 1bd6c646..71bed941 100644
--- a/SafeExamBrowser.UserInterface/Controls/PowerSupplyControl.xaml.cs
+++ b/SafeExamBrowser.UserInterface/Controls/PowerSupplyControl.xaml.cs
@@ -12,7 +12,7 @@ using System.Windows.Media;
 using SafeExamBrowser.Contracts.SystemComponents;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
 
-namespace SafeExamBrowser.UserInterface.Controls
+namespace SafeExamBrowser.UserInterface.Windows10.Controls
 {
 	public partial class PowerSupplyControl : UserControl, ISystemPowerSupplyControl
 	{
diff --git a/SafeExamBrowser.UserInterface/Controls/QuitButton.xaml b/SafeExamBrowser.UserInterface/Controls/QuitButton.xaml
index 3a292f13..4a727ba1 100644
--- a/SafeExamBrowser.UserInterface/Controls/QuitButton.xaml
+++ b/SafeExamBrowser.UserInterface/Controls/QuitButton.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="SafeExamBrowser.UserInterface.Controls.QuitButton"
+<UserControl x:Class="SafeExamBrowser.UserInterface.Windows10.Controls.QuitButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
+             xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="40" d:DesignWidth="40">
     <Grid>
diff --git a/SafeExamBrowser.UserInterface/Controls/QuitButton.xaml.cs b/SafeExamBrowser.UserInterface/Controls/QuitButton.xaml.cs
index 77a3e3d2..5e7754df 100644
--- a/SafeExamBrowser.UserInterface/Controls/QuitButton.xaml.cs
+++ b/SafeExamBrowser.UserInterface/Controls/QuitButton.xaml.cs
@@ -9,7 +9,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace SafeExamBrowser.UserInterface.Controls
+namespace SafeExamBrowser.UserInterface.Windows10.Controls
 {
 	public partial class QuitButton : UserControl
 	{
diff --git a/SafeExamBrowser.UserInterface/LogWindow.xaml b/SafeExamBrowser.UserInterface/LogWindow.xaml
index 95a7a812..c22785ea 100644
--- a/SafeExamBrowser.UserInterface/LogWindow.xaml
+++ b/SafeExamBrowser.UserInterface/LogWindow.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="SafeExamBrowser.UserInterface.LogWindow"
+<Window x:Class="SafeExamBrowser.UserInterface.Windows10.LogWindow"
         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"
-        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface"
+        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10"
         mc:Ignorable="d"
         Title="{Binding Path=WindowTitle}" Height="500" Width="1100" MinHeight="350" MinWidth="350" WindowStartupLocation="CenterScreen"
         Icon="./Images/LogNotification.ico">
diff --git a/SafeExamBrowser.UserInterface/LogWindow.xaml.cs b/SafeExamBrowser.UserInterface/LogWindow.xaml.cs
index 4248a746..1cda6cd6 100644
--- a/SafeExamBrowser.UserInterface/LogWindow.xaml.cs
+++ b/SafeExamBrowser.UserInterface/LogWindow.xaml.cs
@@ -11,9 +11,9 @@ using System.Windows;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
-using SafeExamBrowser.UserInterface.ViewModels;
+using SafeExamBrowser.UserInterface.Windows10.ViewModels;
 
-namespace SafeExamBrowser.UserInterface
+namespace SafeExamBrowser.UserInterface.Windows10
 {
 	public partial class LogWindow : Window, IWindow
 	{
diff --git a/SafeExamBrowser.UserInterface/Properties/Resources.Designer.cs b/SafeExamBrowser.UserInterface/Properties/Resources.Designer.cs
index f9b07995..52f5e8f4 100644
--- a/SafeExamBrowser.UserInterface/Properties/Resources.Designer.cs
+++ b/SafeExamBrowser.UserInterface/Properties/Resources.Designer.cs
@@ -8,7 +8,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace SafeExamBrowser.UserInterface.Properties {
+namespace SafeExamBrowser.UserInterface.Windows10.Properties {
+    using System;
     
     
     /// <summary>
@@ -18,7 +19,7 @@ namespace SafeExamBrowser.UserInterface.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -37,8 +38,8 @@ namespace SafeExamBrowser.UserInterface.Properties {
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if ((resourceMan == null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SafeExamBrowser.UserInterface.Properties.Resources", typeof(Resources).Assembly);
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SafeExamBrowser.UserInterface.Windows10.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/SafeExamBrowser.UserInterface/Properties/Settings.Designer.cs b/SafeExamBrowser.UserInterface/Properties/Settings.Designer.cs
index e023e304..145ce273 100644
--- a/SafeExamBrowser.UserInterface/Properties/Settings.Designer.cs
+++ b/SafeExamBrowser.UserInterface/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace SafeExamBrowser.UserInterface.Properties
-{
+namespace SafeExamBrowser.UserInterface.Windows10.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.3.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
-        public static Settings Default
-        {
-            get
-            {
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.csproj b/SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.Windows10.csproj
similarity index 98%
rename from SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.csproj
rename to SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.Windows10.csproj
index c172c8ab..554cb850 100644
--- a/SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.csproj
+++ b/SafeExamBrowser.UserInterface/SafeExamBrowser.UserInterface.Windows10.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{E1BE031A-4354-41E7-83E8-843DED4489FF}</ProjectGuid>
     <OutputType>library</OutputType>
-    <RootNamespace>SafeExamBrowser.UserInterface</RootNamespace>
-    <AssemblyName>SafeExamBrowser.UserInterface</AssemblyName>
+    <RootNamespace>SafeExamBrowser.UserInterface.Windows10</RootNamespace>
+    <AssemblyName>SafeExamBrowser.UserInterface.Windows10</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/SafeExamBrowser.UserInterface/SplashScreen.xaml b/SafeExamBrowser.UserInterface/SplashScreen.xaml
index 38e3c041..66d802f6 100644
--- a/SafeExamBrowser.UserInterface/SplashScreen.xaml
+++ b/SafeExamBrowser.UserInterface/SplashScreen.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="SafeExamBrowser.UserInterface.SplashScreen"
+<Window x:Class="SafeExamBrowser.UserInterface.Windows10.SplashScreen"
         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"
@@ -20,7 +20,7 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="155" />
                 </Grid.ColumnDefinitions>
-                <Image Grid.Column="0" Grid.ColumnSpan="2" Source="pack://application:,,,/SafeExamBrowser.UserInterface;component/Images/SplashScreen.png" />
+                <Image Grid.Column="0" Grid.ColumnSpan="2" Source="pack://application:,,,/SafeExamBrowser.UserInterface.Windows10;component/Images/SplashScreen.png" />
                 <TextBlock x:Name="InfoTextBlock" Grid.Column="1" Foreground="White" Margin="10,75,10,10" TextWrapping="Wrap" />
             </Grid>
             <ProgressBar x:Name="ProgressBar" Grid.Row="1" Minimum="0" Maximum="{Binding Path=MaxProgress}" Value="{Binding Path=CurrentProgress}" IsIndeterminate="{Binding Path=IsIndeterminate}" Background="#00000000" BorderThickness="0" />
diff --git a/SafeExamBrowser.UserInterface/SplashScreen.xaml.cs b/SafeExamBrowser.UserInterface/SplashScreen.xaml.cs
index 52ef86d5..87300276 100644
--- a/SafeExamBrowser.UserInterface/SplashScreen.xaml.cs
+++ b/SafeExamBrowser.UserInterface/SplashScreen.xaml.cs
@@ -11,9 +11,9 @@ using System.Windows.Documents;
 using SafeExamBrowser.Contracts.Configuration.Settings;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.UserInterface;
-using SafeExamBrowser.UserInterface.ViewModels;
+using SafeExamBrowser.UserInterface.Windows10.ViewModels;
 
-namespace SafeExamBrowser.UserInterface
+namespace SafeExamBrowser.UserInterface.Windows10
 {
 	public partial class SplashScreen : Window, ISplashScreen
 	{
diff --git a/SafeExamBrowser.UserInterface/Taskbar.xaml b/SafeExamBrowser.UserInterface/Taskbar.xaml
index 77854aeb..44bf2ad2 100644
--- a/SafeExamBrowser.UserInterface/Taskbar.xaml
+++ b/SafeExamBrowser.UserInterface/Taskbar.xaml
@@ -1,9 +1,9 @@
-<Window x:Class="SafeExamBrowser.UserInterface.Taskbar"
+<Window x:Class="SafeExamBrowser.UserInterface.Windows10.Taskbar"
         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"
-        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Controls"
+        xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10.Controls"
         xmlns:s="clr-namespace:System;assembly=mscorlib"
         mc:Ignorable="d"
         Title="Taskbar" Height="40" Width="750" WindowStyle="None" AllowsTransparency="True" Topmost="True" Visibility="Collapsed"
diff --git a/SafeExamBrowser.UserInterface/Taskbar.xaml.cs b/SafeExamBrowser.UserInterface/Taskbar.xaml.cs
index f4e7db12..1d5dc775 100644
--- a/SafeExamBrowser.UserInterface/Taskbar.xaml.cs
+++ b/SafeExamBrowser.UserInterface/Taskbar.xaml.cs
@@ -9,9 +9,9 @@
 using System.Windows;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
-using SafeExamBrowser.UserInterface.Utilities;
+using SafeExamBrowser.UserInterface.Windows10.Utilities;
 
-namespace SafeExamBrowser.UserInterface
+namespace SafeExamBrowser.UserInterface.Windows10
 {
 	public partial class Taskbar : Window, ITaskbar
 	{
diff --git a/SafeExamBrowser.UserInterface/Templates/Buttons.xaml b/SafeExamBrowser.UserInterface/Templates/Buttons.xaml
index 6295dae0..781ee401 100644
--- a/SafeExamBrowser.UserInterface/Templates/Buttons.xaml
+++ b/SafeExamBrowser.UserInterface/Templates/Buttons.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Styles">
+                    xmlns:local="clr-namespace:SafeExamBrowser.UserInterface.Windows10.Styles">
     <ControlTemplate x:Key="TaskbarButton" TargetType="Button">
         <Border x:Name="ButtonContent" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}">
             <ContentPresenter ContentSource="Content" HorizontalAlignment="Center" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" />
diff --git a/SafeExamBrowser.UserInterface/UserInterfaceFactory.cs b/SafeExamBrowser.UserInterface/UserInterfaceFactory.cs
index bf8817fe..2b1c9296 100644
--- a/SafeExamBrowser.UserInterface/UserInterfaceFactory.cs
+++ b/SafeExamBrowser.UserInterface/UserInterfaceFactory.cs
@@ -14,9 +14,9 @@ using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 using SafeExamBrowser.Contracts.UserInterface;
 using SafeExamBrowser.Contracts.UserInterface.Taskbar;
-using SafeExamBrowser.UserInterface.Controls;
+using SafeExamBrowser.UserInterface.Windows10.Controls;
 
-namespace SafeExamBrowser.UserInterface
+namespace SafeExamBrowser.UserInterface.Windows10
 {
 	public class UserInterfaceFactory : IUserInterfaceFactory
 	{
diff --git a/SafeExamBrowser.UserInterface/Utilities/IconResourceLoader.cs b/SafeExamBrowser.UserInterface/Utilities/IconResourceLoader.cs
index d38c5dee..aca89c82 100644
--- a/SafeExamBrowser.UserInterface/Utilities/IconResourceLoader.cs
+++ b/SafeExamBrowser.UserInterface/Utilities/IconResourceLoader.cs
@@ -15,7 +15,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using SafeExamBrowser.Contracts.Configuration;
 
-namespace SafeExamBrowser.UserInterface.Utilities
+namespace SafeExamBrowser.UserInterface.Windows10.Utilities
 {
 	internal static class IconResourceLoader
 	{
diff --git a/SafeExamBrowser.UserInterface/Utilities/VisualExtensions.cs b/SafeExamBrowser.UserInterface/Utilities/VisualExtensions.cs
index 749e76cf..3b1d9089 100644
--- a/SafeExamBrowser.UserInterface/Utilities/VisualExtensions.cs
+++ b/SafeExamBrowser.UserInterface/Utilities/VisualExtensions.cs
@@ -10,7 +10,7 @@ using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media;
 
-namespace SafeExamBrowser.UserInterface.Utilities
+namespace SafeExamBrowser.UserInterface.Windows10.Utilities
 {
 	internal static class VisualExtensions
 	{
diff --git a/SafeExamBrowser.UserInterface/ViewModels/DateTimeViewModel.cs b/SafeExamBrowser.UserInterface/ViewModels/DateTimeViewModel.cs
index 09e0ab1c..159085be 100644
--- a/SafeExamBrowser.UserInterface/ViewModels/DateTimeViewModel.cs
+++ b/SafeExamBrowser.UserInterface/ViewModels/DateTimeViewModel.cs
@@ -10,7 +10,7 @@ using System;
 using System.ComponentModel;
 using System.Timers;
 
-namespace SafeExamBrowser.UserInterface.ViewModels
+namespace SafeExamBrowser.UserInterface.Windows10.ViewModels
 {
 	class DateTimeViewModel : INotifyPropertyChanged
 	{
diff --git a/SafeExamBrowser.UserInterface/ViewModels/LogViewModel.cs b/SafeExamBrowser.UserInterface/ViewModels/LogViewModel.cs
index f7b96a10..9da3f614 100644
--- a/SafeExamBrowser.UserInterface/ViewModels/LogViewModel.cs
+++ b/SafeExamBrowser.UserInterface/ViewModels/LogViewModel.cs
@@ -14,7 +14,7 @@ using System.Windows.Media;
 using SafeExamBrowser.Contracts.I18n;
 using SafeExamBrowser.Contracts.Logging;
 
-namespace SafeExamBrowser.UserInterface.ViewModels
+namespace SafeExamBrowser.UserInterface.Windows10.ViewModels
 {
 	internal class LogViewModel : ILogObserver
 	{
diff --git a/SafeExamBrowser.UserInterface/ViewModels/SplashScreenViewModel.cs b/SafeExamBrowser.UserInterface/ViewModels/SplashScreenViewModel.cs
index 90dbbed1..913f024c 100644
--- a/SafeExamBrowser.UserInterface/ViewModels/SplashScreenViewModel.cs
+++ b/SafeExamBrowser.UserInterface/ViewModels/SplashScreenViewModel.cs
@@ -9,7 +9,7 @@
 using System.ComponentModel;
 using System.Timers;
 
-namespace SafeExamBrowser.UserInterface.ViewModels
+namespace SafeExamBrowser.UserInterface.Windows10.ViewModels
 {
 	class SplashScreenViewModel : INotifyPropertyChanged
 	{
diff --git a/SafeExamBrowser.sln b/SafeExamBrowser.sln
index 71cf2403..de6fcc40 100644
--- a/SafeExamBrowser.sln
+++ b/SafeExamBrowser.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser", "SafeExamBrowser\SafeExamBrowser.csproj", "{E3AED2F8-B5DF-45D1-AC19-48066923D6D8}"
 EndProject
@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.UserInterface", "SafeExamBrowser.UserInterface\SafeExamBrowser.UserInterface.csproj", "{E1BE031A-4354-41E7-83E8-843DED4489FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.UserInterface.Windows10", "SafeExamBrowser.UserInterface\SafeExamBrowser.UserInterface.Windows10.csproj", "{E1BE031A-4354-41E7-83E8-843DED4489FF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SafeExamBrowser.Core.UnitTests", "SafeExamBrowser.Core.UnitTests\SafeExamBrowser.Core.UnitTests.csproj", "{48B9F2A1-B87D-40F0-BEC9-399E8909860F}"
 EndProject
@@ -121,4 +121,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {42A10DA5-96FA-443F-B3DE-5399FC325752}
+	EndGlobalSection
 EndGlobal
diff --git a/SafeExamBrowser/CompositionRoot.cs b/SafeExamBrowser/CompositionRoot.cs
index 23238abc..5ccb6311 100644
--- a/SafeExamBrowser/CompositionRoot.cs
+++ b/SafeExamBrowser/CompositionRoot.cs
@@ -29,7 +29,7 @@ using SafeExamBrowser.Monitoring.Mouse;
 using SafeExamBrowser.Monitoring.Processes;
 using SafeExamBrowser.Monitoring.Windows;
 using SafeExamBrowser.SystemComponents;
-using SafeExamBrowser.UserInterface;
+using SafeExamBrowser.UserInterface.Windows10;
 using SafeExamBrowser.WindowsApi;
 
 namespace SafeExamBrowser
diff --git a/SafeExamBrowser/SafeExamBrowser.csproj b/SafeExamBrowser/SafeExamBrowser.csproj
index db1283fb..f32e964e 100644
--- a/SafeExamBrowser/SafeExamBrowser.csproj
+++ b/SafeExamBrowser/SafeExamBrowser.csproj
@@ -139,9 +139,9 @@
       <Project>{ACEE2EF1-14D2-4B52-8994-5C053055BB51}</Project>
       <Name>SafeExamBrowser.SystemComponents</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SafeExamBrowser.UserInterface\SafeExamBrowser.UserInterface.csproj">
+    <ProjectReference Include="..\SafeExamBrowser.UserInterface\SafeExamBrowser.UserInterface.Windows10.csproj">
       <Project>{e1be031a-4354-41e7-83e8-843ded4489ff}</Project>
-      <Name>SafeExamBrowser.UserInterface</Name>
+      <Name>SafeExamBrowser.UserInterface.Windows10</Name>
     </ProjectReference>
     <ProjectReference Include="..\SafeExamBrowser.WindowsApi\SafeExamBrowser.WindowsApi.csproj">
       <Project>{73724659-4150-4792-A94E-42F5F3C1B696}</Project>