diff --git a/Torch.Server/Views/Entities/VoxelMapView.xaml b/Torch.Server/Views/Entities/VoxelMapView.xaml
index 3c0409b..46eea25 100644
--- a/Torch.Server/Views/Entities/VoxelMapView.xaml
+++ b/Torch.Server/Views/Entities/VoxelMapView.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="Torch.Server.Views.Entities.VoxelMapView"
              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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Torch.Server.Views.Entities"
              xmlns:entities="clr-namespace:Torch.Server.ViewModels.Entities"
@@ -11,8 +11,8 @@
     </UserControl.DataContext>
     <Grid>
         <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Expander Grid.Row="0" Header="Attached Grids">
             <ListView ItemsSource="{Binding AttachedGrids}" Margin="3">
@@ -23,7 +23,7 @@
                 </ListView.ItemTemplate>
             </ListView>
         </Expander>
-        
+
         <ScrollViewer Grid.Row="1" Margin="3" VerticalScrollBarVisibility="Auto">
             <local:EntityControlsView DataContext="{Binding}"/>
         </ScrollViewer>
diff --git a/Torch.Server/Views/TorchUI.xaml.cs b/Torch.Server/Views/TorchUI.xaml.cs
index 31f5c24..c7a210d 100644
--- a/Torch.Server/Views/TorchUI.xaml.cs
+++ b/Torch.Server/Views/TorchUI.xaml.cs
@@ -49,10 +49,10 @@ namespace Torch.Server
             PlayerList.BindServer(server);
             Plugins.BindServer(server);
 
+            LoadConfig((TorchConfig)server.Config);
+
             Themes.uiSource = this;
             Themes.SetConfig(_config);
-
-            LoadConfig((TorchConfig)server.Config);
         }
 
         private void AttachConsole()
diff --git a/Torch/Views/PropertyGrid.xaml b/Torch/Views/PropertyGrid.xaml
index 50893b8..273c84f 100644
--- a/Torch/Views/PropertyGrid.xaml
+++ b/Torch/Views/PropertyGrid.xaml
@@ -11,7 +11,7 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0"> 
+        <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition/>