diff --git a/DarkUI/DarkUI.WPF/Converters/HtmlToUIColorConverter.cs b/DarkUI/DarkUI.WPF/Converters/HtmlToUIColorConverter.cs
new file mode 100644
index 0000000000..34bfd05355
--- /dev/null
+++ b/DarkUI/DarkUI.WPF/Converters/HtmlToUIColorConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Drawing;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace DarkUI.WPF.Converters;
+
+public class HtmlToUIColorConverter : IValueConverter
+{
+	public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		var colString = (string)value;
+		var col = ColorTranslator.FromHtml(colString);
+		return System.Windows.Media.Color.FromArgb(col.A, col.R, col.G, col.B);
+	}
+
+	public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		var col = (System.Windows.Media.Color)value;
+		return ColorTranslator.ToHtml(Color.FromArgb(col.A, col.R, col.G, col.B));
+	}
+}
diff --git a/DarkUI/DarkUI.WPF/Converters/VectorToBrushConverter.cs b/DarkUI/DarkUI.WPF/Converters/VectorToBrushConverter.cs
new file mode 100644
index 0000000000..ec9b768123
--- /dev/null
+++ b/DarkUI/DarkUI.WPF/Converters/VectorToBrushConverter.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Globalization;
+using System.Numerics;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace DarkUI.WPF.Converters;
+
+public class VectorToBrushConverter : IValueConverter
+{
+	public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		var vec = (Vector4)value;
+		byte r = (byte)(Math.Clamp(vec.X, 0.0f, 1.0f) * 255.0f);
+		byte g = (byte)(Math.Clamp(vec.Y, 0.0f, 1.0f) * 255.0f);
+		byte b = (byte)(Math.Clamp(vec.Z, 0.0f, 1.0f) * 255.0f);
+		byte a = (byte)(Math.Clamp(vec.W, 0.0f, 1.0f) * 255.0f);
+
+		return new SolidColorBrush(Color.FromArgb(a, r, g, b));
+	}
+
+	public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		Color col = ((SolidColorBrush)value).Color;
+		return new Vector4(col.R / 255.0f, col.G / 255.0f, col.B / 255.0f, col.A / 255.0f);
+	}
+}
diff --git a/DarkUI/DarkUI.WPF/Converters/VectorToUIColorConverter.cs b/DarkUI/DarkUI.WPF/Converters/VectorToUIColorConverter.cs
new file mode 100644
index 0000000000..4359d20679
--- /dev/null
+++ b/DarkUI/DarkUI.WPF/Converters/VectorToUIColorConverter.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Globalization;
+using System.Numerics;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace DarkUI.WPF.Converters;
+
+public class VectorToUIColorConverter : IValueConverter
+{
+	public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		var vec = (Vector4)value;
+		byte r = (byte)(Math.Clamp(vec.X, 0.0f, 1.0f) * 255.0f);
+		byte g = (byte)(Math.Clamp(vec.Y, 0.0f, 1.0f) * 255.0f);
+		byte b = (byte)(Math.Clamp(vec.Z, 0.0f, 1.0f) * 255.0f);
+		byte a = (byte)(Math.Clamp(vec.W, 0.0f, 1.0f) * 255.0f);
+		return Color.FromArgb(a, r, g, b);
+	}
+
+	public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		var col = (Color)value;
+		return new Vector4(col.R / 255.0f, col.G / 255.0f, col.B / 255.0f, col.A / 255.0f);
+	}
+}
diff --git a/DarkUI/DarkUI.WPF/DarkUI.WPF.csproj b/DarkUI/DarkUI.WPF/DarkUI.WPF.csproj
index 054b6f2730..14535c8bf4 100644
--- a/DarkUI/DarkUI.WPF/DarkUI.WPF.csproj
+++ b/DarkUI/DarkUI.WPF/DarkUI.WPF.csproj
@@ -34,6 +34,10 @@
     <PackageReference Include="SpacedGrid-WPF" Version="1.0.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\DarkUI\DarkUI.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Resources\down-right-16.png" />
     <Resource Include="Resources\Invert.ps" />
diff --git a/DarkUI/DarkUI.WPF/Dictionaries/BlackColors.xaml b/DarkUI/DarkUI.WPF/Dictionaries/BlackColors.xaml
index 9fd8a7550e..d7f076dbc6 100644
--- a/DarkUI/DarkUI.WPF/Dictionaries/BlackColors.xaml
+++ b/DarkUI/DarkUI.WPF/Dictionaries/BlackColors.xaml
@@ -32,6 +32,7 @@
 	<sys:Double x:Key="Opacity_PressedHighlight">0.5</sys:Double>
 	<sys:Double x:Key="Opacity_CheckedHighlight">0.25</sys:Double>
 	<sys:Double x:Key="Opacity_DisabledContent">0.5</sys:Double>
+	<sys:Double x:Key="Opacity_Icon">1.0</sys:Double>
 
 	<sys:Double x:Key="DropShadow_Opacity">0.3</sys:Double>
 	<sys:Double x:Key="DropShadow_Depth">3</sys:Double>
diff --git a/DarkUI/DarkUI.WPF/Dictionaries/DarkColors.xaml b/DarkUI/DarkUI.WPF/Dictionaries/DarkColors.xaml
index 542f15f518..3c85524c27 100644
--- a/DarkUI/DarkUI.WPF/Dictionaries/DarkColors.xaml
+++ b/DarkUI/DarkUI.WPF/Dictionaries/DarkColors.xaml
@@ -1,4 +1,5 @@
 <ResourceDictionary
+	x:Class="DarkUI.WPF.Dictionaries.DarkColors"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:sys="clr-namespace:System;assembly=mscorlib">
@@ -34,6 +35,7 @@
 	<sys:Double x:Key="Opacity_PressedHighlight">0.5</sys:Double>
 	<sys:Double x:Key="Opacity_CheckedHighlight">0.25</sys:Double>
 	<sys:Double x:Key="Opacity_DisabledContent">0.5</sys:Double>
+	<sys:Double x:Key="Opacity_Icon">1.0</sys:Double>
 
 	<sys:Double x:Key="DropShadow_Opacity">0.3</sys:Double>
 	<sys:Double x:Key="DropShadow_Depth">3</sys:Double>
diff --git a/DarkUI/DarkUI.WPF/Dictionaries/DarkColors.xaml.cs b/DarkUI/DarkUI.WPF/Dictionaries/DarkColors.xaml.cs
new file mode 100644
index 0000000000..2f804e145e
--- /dev/null
+++ b/DarkUI/DarkUI.WPF/Dictionaries/DarkColors.xaml.cs
@@ -0,0 +1,47 @@
+using DarkUI.Config;
+
+using System.Windows;
+
+namespace DarkUI.WPF.Dictionaries;
+
+public partial class DarkColors : ResourceDictionary
+{
+	public DarkColors()
+	{
+		InitializeComponent();
+
+		if (!Colors.HasBrightnessChanged)
+			return;
+
+		ApplyDarkUiColors();
+	}
+
+	private void ApplyDarkUiColors()
+	{
+		// Keep the XAML palette as the fallback and overwrite it only when DarkUI brightness has changed.
+		SetColor("Color_Text", Colors.LightText);
+		SetColor("Color_Background", Colors.GreyBackground);
+		SetColor("Color_Background_Alternative", Colors.HeaderBackground);
+		SetColor("Color_Background_Control", Colors.LightBackground);
+		SetColor("Color_Background_Defaulted", Colors.DarkBlueBackground);
+		SetColor("Color_Background_Disabled", Colors.DarkGreySelection);
+		SetColor("Color_Background_High", Colors.LighterBackground);
+		SetColor("Color_Background_Low", Colors.MediumBackground);
+
+		SetColor("Color_Border", Colors.GreySelection);
+		SetColor("Color_Border_High", Colors.LightestBackground);
+		SetColor("Color_Border_Low", Colors.MediumBackground);
+
+		SetColor("Color_Highlight", Colors.BlueHighlight);
+		SetColor("Color_Selection", Colors.BlueSelection);
+		SetColor("Color_Selection_LostFocus", Colors.GreySelection);
+		SetColor("Color_WindowBorder", Colors.BlueBackground);
+
+		this["Opacity_Icon"] = (double)Colors.Brightness;
+	}
+
+	private void SetColor(string key, System.Drawing.Color color)
+	{
+		this[key] = System.Windows.Media.Color.FromArgb(color.A, color.R, color.G, color.B);
+	}
+}
diff --git a/DarkUI/DarkUI.WPF/Dictionaries/LightColors.xaml b/DarkUI/DarkUI.WPF/Dictionaries/LightColors.xaml
index b6e6eaa2f6..455ae2fa91 100644
--- a/DarkUI/DarkUI.WPF/Dictionaries/LightColors.xaml
+++ b/DarkUI/DarkUI.WPF/Dictionaries/LightColors.xaml
@@ -32,6 +32,7 @@
 	<sys:Double x:Key="Opacity_PressedHighlight">0.25</sys:Double>
 	<sys:Double x:Key="Opacity_CheckedHighlight">0.2</sys:Double>
 	<sys:Double x:Key="Opacity_DisabledContent">0.5</sys:Double>
+	<sys:Double x:Key="Opacity_Icon">1.0</sys:Double>
 
 	<sys:Double x:Key="DropShadow_Opacity">0.3</sys:Double>
 	<sys:Double x:Key="DropShadow_Depth">3</sys:Double>
diff --git a/DarkUI/DarkUI.WPF/Styles/ColorPickerButton.xaml b/DarkUI/DarkUI.WPF/Styles/ColorPickerButton.xaml
index 2ff27cde8a..da77e83f0b 100644
--- a/DarkUI/DarkUI.WPF/Styles/ColorPickerButton.xaml
+++ b/DarkUI/DarkUI.WPF/Styles/ColorPickerButton.xaml
@@ -17,7 +17,7 @@
 		<Setter Property="BorderBrush" Value="{DynamicResource Brush_Border}" />
 
 		<!--  Thicknesses  -->
-		<Setter Property="BorderThickness" Value="{x:Static local:Defaults.InputControl_DefaultPadding}" />
+		<Setter Property="BorderThickness" Value="{x:Static local:Defaults.BorderThickness}" />
 
 		<!--  Template  -->
 		<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
diff --git a/DarkUI/DarkUI.WPF/Styles/Icon.xaml b/DarkUI/DarkUI.WPF/Styles/Icon.xaml
index 1938c78b32..23dcc9ed4d 100644
--- a/DarkUI/DarkUI.WPF/Styles/Icon.xaml
+++ b/DarkUI/DarkUI.WPF/Styles/Icon.xaml
@@ -7,6 +7,7 @@
 
 	<Style x:Key="ImageIcon" TargetType="{x:Type Image}">
 		<Setter Property="FlowDirection" Value="LeftToRight" />
+		<Setter Property="Opacity" Value="{DynamicResource Opacity_Icon}" />
 
 		<Style.Triggers>
 			<DataTrigger Binding="{Binding Path=(local:Defaults.ShouldIconsInvert)}" Value="True">
@@ -20,6 +21,7 @@
 		<Setter Property="MaxHeight" Value="{x:Static local:Defaults.Image_MaxIconHeight}" />
 
 		<Setter Property="FlowDirection" Value="LeftToRight" />
+		<Setter Property="Opacity" Value="{DynamicResource Opacity_Icon}" />
 
 		<Style.Triggers>
 			<DataTrigger Binding="{Binding Path=(local:Defaults.ShouldIconsInvert)}" Value="True">
diff --git a/DarkUI/DarkUI.WPF/Styles/NumericUpDown.xaml b/DarkUI/DarkUI.WPF/Styles/NumericUpDown.xaml
index be3000ccd3..9c33e70d1a 100644
--- a/DarkUI/DarkUI.WPF/Styles/NumericUpDown.xaml
+++ b/DarkUI/DarkUI.WPF/Styles/NumericUpDown.xaml
@@ -16,6 +16,7 @@
 
 		<!--  Brushes  -->
 		<Setter Property="BorderBrush" Value="{DynamicResource Brush_Border}" />
+		<Setter Property="Foreground" Value="{DynamicResource Brush_Text}" />
 
 		<!--  Thicknesses  -->
 		<Setter Property="BorderThickness" Value="{x:Static local:Defaults.BorderThickness}" />
diff --git a/DarkUI/DarkUI/Config/Colors.cs b/DarkUI/DarkUI/Config/Colors.cs
index 518a9b469d..7d609db32a 100644
--- a/DarkUI/DarkUI/Config/Colors.cs
+++ b/DarkUI/DarkUI/Config/Colors.cs
@@ -48,6 +48,8 @@ public static class Colors
         public const float MaxBrightness = 1.0f;
         public const float MinBrightness = 0.5f;
 
+        public static bool HasBrightnessChanged { get; private set; }
+
         // AlphaBrightness is a helper value which is used in filling overlay rectangles
         // over image controls (e.g. buttons with pictures, arrows in comboboxes etc.).
         public static float AlphaBrightness => MaxBrightness - Brightness;
@@ -63,6 +65,7 @@ public static float Brightness
             set
             {
                 _brightness = Math.Min(Math.Max(value, MinBrightness), MaxBrightness);
+                HasBrightnessChanged = _brightness != 1.0f;
 
                 GreyBackground  	= DarkBase.Multiply(_brightness * 1.000f, _brightness * 1.000f, _brightness * 1.000f);
 				HeaderBackground  	= DarkBase.Multiply(_brightness * 0.950f, _brightness * 0.952f, _brightness * 0.954f);
diff --git a/TombEditor.Tests/FlybyTimeline/FlybyPreviewTests.cs b/TombEditor.Tests/FlybyTimeline/FlybyPreviewTests.cs
index 5e87a42a50..06c2682129 100644
--- a/TombEditor.Tests/FlybyTimeline/FlybyPreviewTests.cs
+++ b/TombEditor.Tests/FlybyTimeline/FlybyPreviewTests.cs
@@ -1,5 +1,5 @@
 using System.Numerics;
-using TombEditor.Controls.FlybyTimeline.Preview;
+using TombEditor.Features.FlybyTimeline.Preview;
 using TombLib;
 using TombLib.Graphics;
 using TombLib.LevelData;
diff --git a/TombEditor.Tests/FlybyTimeline/FlybySequenceCacheTests.cs b/TombEditor.Tests/FlybyTimeline/FlybySequenceCacheTests.cs
index f3516ade53..af28420932 100644
--- a/TombEditor.Tests/FlybyTimeline/FlybySequenceCacheTests.cs
+++ b/TombEditor.Tests/FlybyTimeline/FlybySequenceCacheTests.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
-using TombEditor.Controls.FlybyTimeline;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline;
+using TombEditor.Features.FlybyTimeline.Sequence;
 
 namespace TombEditor.Tests.FlybyTimeline;
 
diff --git a/TombEditor.Tests/FlybyTimeline/FlybySequenceHelperTests.cs b/TombEditor.Tests/FlybyTimeline/FlybySequenceHelperTests.cs
index d70116fe04..01903304f3 100644
--- a/TombEditor.Tests/FlybyTimeline/FlybySequenceHelperTests.cs
+++ b/TombEditor.Tests/FlybyTimeline/FlybySequenceHelperTests.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
-using TombEditor.Controls.FlybyTimeline;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib;
 using TombLib.Graphics;
 using TombLib.LevelData;
diff --git a/TombEditor.Tests/FlybyTimeline/FlybySequenceTimingTests.cs b/TombEditor.Tests/FlybyTimeline/FlybySequenceTimingTests.cs
index 770b16035c..96403492d7 100644
--- a/TombEditor.Tests/FlybyTimeline/FlybySequenceTimingTests.cs
+++ b/TombEditor.Tests/FlybyTimeline/FlybySequenceTimingTests.cs
@@ -1,6 +1,6 @@
 using System.Numerics;
-using TombEditor.Controls.FlybyTimeline;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib.LevelData;
 
 namespace TombEditor.Tests.FlybyTimeline;
diff --git a/TombEditor/Command.cs b/TombEditor/Command.cs
index 05f67389ac..b2bce3b32f 100644
--- a/TombEditor/Command.cs
+++ b/TombEditor/Command.cs
@@ -1,3 +1,5 @@
+using DarkUI.Controls;
+using DarkUI.Forms;
 using NLog;
 using System;
 using System.Collections.Generic;
@@ -7,20 +9,28 @@
 using System.Numerics;
 using System.Text;
 using System.Windows.Forms;
-using DarkUI.Controls;
-using DarkUI.Forms;
+using TombEditor.Controls;
+using TombEditor.Features.DockableViews.ContentBrowser;
+using TombEditor.Features.DockableViews.ImportedGeometryBrowser;
+using TombEditor.Features.DockableViews.ItemBrowser;
+using TombEditor.Features.DockableViews.LightingPanel;
+using TombEditor.Features.DockableViews.ObjectList;
+using TombEditor.Features.DockableViews.PalettePanel;
+using TombEditor.Features.DockableViews.RoomOptionsPanel;
+using TombEditor.Features.DockableViews.SectorOptionsPanel;
+using TombEditor.Features.DockableViews.TexturePanel;
+using TombEditor.Features.DockableViews.TriggerList;
+using TombEditor.Features.Panel3D.ToolPalette;
 using TombEditor.Forms;
-using TombEditor.ToolWindows;
 using TombLib;
 using TombLib.Controls;
 using TombLib.Forms;
 using TombLib.LevelData;
-using TombLib.Wad;
-using TombLib.Wad.Catalog;
-using TombLib.Utils;
 using TombLib.LevelData.SectorEnums;
 using TombLib.LevelData.SectorEnums.Extensions;
-using TombEditor.Controls;
+using TombLib.Utils;
+using TombLib.Wad;
+using TombLib.Wad.Catalog;
 
 namespace TombEditor
 {
@@ -53,6 +63,14 @@ public class CommandArgs
         public Editor Editor;
         public IWin32Window Window;
         public Keys KeyData = Keys.None;
+
+        public CommandArgs() { }
+
+        public CommandArgs(IWin32Window window, Editor editor)
+        {
+            Window = window;
+            Editor = editor;
+        }
     }
 
     public static class CommandHandler
@@ -69,6 +87,13 @@ public static CommandObj GetCommand(string name)
             return command;
         }
 
+        public static System.Windows.Input.ICommand GetCommand(string name, CommandArgs args)
+        {
+            var command = GetCommand(name);
+            return new CommunityToolkit.Mvvm.Input.RelayCommand(
+                () => command.Execute?.Invoke(args));
+        }
+
         public static void ExecuteHotkey(CommandArgs args)
         {
             var hotkeyForCommands = args.Editor.Configuration.UI_Hotkeys.Where(set => set.Value.Contains(args.KeyData));
diff --git a/TombEditor/Controls/ObjectBrush/ObjectBrushConstants.cs b/TombEditor/Controls/ObjectBrush/ObjectBrushConstants.cs
deleted file mode 100644
index 5ddc20a1d3..0000000000
--- a/TombEditor/Controls/ObjectBrush/ObjectBrushConstants.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using TombLib.LevelData;
-
-namespace TombEditor.Controls.ObjectBrush
-{
-	internal class Constants
-	{
-		public const float RadiusAdjustmentStep = 64.0f;
-		public const float AngleAdjustmentStep = 5.0f;
-		public const float ParamDeadzone = 30;
-
-		public const float MinRadius = 0.1f;
-		public const float MaxRadius = 20.0f;
-		public const float MinDensity = 0.01f;
-		public const float MaxDensity = 10.0f;
-	}
-}
diff --git a/TombEditor/Controls/ObjectBrush/ObjectBrushToolbox.cs b/TombEditor/Controls/ObjectBrush/ObjectBrushToolbox.cs
deleted file mode 100644
index e0448c2013..0000000000
--- a/TombEditor/Controls/ObjectBrush/ObjectBrushToolbox.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-
-using DarkUI.Controls;
-
-namespace TombEditor.Controls.ObjectBrush
-{
-    public partial class ObjectBrushToolbox : DarkFloatingToolbox
-    {
-        public ObjectBrushToolbox()
-        {
-            VerticalGrip = false;
-            GripSize = 12;
-            AutoAnchor = true;
-            SnapToBorders = true;
-            DragAnyPoint = true;
-
-            InitializeComponent();
-
-            _toolboxView.Loaded += OnToolboxViewLoaded;
-        }
-
-        private void OnToolboxViewLoaded(object sender, System.Windows.RoutedEventArgs e)
-        {
-            _toolboxView.Loaded -= OnToolboxViewLoaded;
-            UpdateSizeFromContent();
-        }
-
-        // Measures WPF content and resizes the floating toolbox to fit.
-
-        private void UpdateSizeFromContent()
-        {
-            _toolboxView.Measure(new System.Windows.Size(
-                double.PositiveInfinity, double.PositiveInfinity));
-
-            var desired = _toolboxView.DesiredSize;
-            float dpiScale = DeviceDpi / 96f;
-
-            int contentWidth = (int)Math.Ceiling(desired.Width * dpiScale);
-            int contentHeight = (int)Math.Ceiling(desired.Height * dpiScale);
-
-            Size = new System.Drawing.Size(
-                contentWidth + Padding.Left + Padding.Right,
-                contentHeight + Padding.Top + Padding.Bottom);
-        }
-    }
-}
diff --git a/TombEditor/Controls/Panel3D/Panel3D.cs b/TombEditor/Controls/Panel3D/Panel3D.cs
index c7fa5ef65e..880f0b5a22 100644
--- a/TombEditor/Controls/Panel3D/Panel3D.cs
+++ b/TombEditor/Controls/Panel3D/Panel3D.cs
@@ -9,7 +9,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using TombEditor.Controls.ContextMenus;
-using TombEditor.Controls.FlybyTimeline.Preview;
+using TombEditor.Features.FlybyTimeline.Preview;
 using TombLib;
 using TombLib.Controls;
 using TombLib.Graphics;
diff --git a/TombEditor/Controls/Panel3D/Panel3DCameraMovement.cs b/TombEditor/Controls/Panel3D/Panel3DCameraMovement.cs
index 93e9643ebc..52e7b488a0 100644
--- a/TombEditor/Controls/Panel3D/Panel3DCameraMovement.cs
+++ b/TombEditor/Controls/Panel3D/Panel3DCameraMovement.cs
@@ -4,7 +4,7 @@
 using System.Linq;
 using System.Numerics;
 using System.Windows.Forms;
-using TombEditor.Controls.FlybyTimeline.Preview;
+using TombEditor.Features.FlybyTimeline.Preview;
 using TombLib;
 using TombLib.Controls;
 using TombLib.Forms;
diff --git a/TombEditor/Controls/Panel3D/Panel3DHelpers.cs b/TombEditor/Controls/Panel3D/Panel3DHelpers.cs
index eba6ecb628..bc524246fe 100644
--- a/TombEditor/Controls/Panel3D/Panel3DHelpers.cs
+++ b/TombEditor/Controls/Panel3D/Panel3DHelpers.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib;
 using TombLib.Graphics;
 using TombLib.LevelData;
diff --git a/TombEditor/Controls/Panel3D/Panel3DObjectBrush.cs b/TombEditor/Controls/Panel3D/Panel3DObjectBrush.cs
index cc6ef9812b..85e5b59e41 100644
--- a/TombEditor/Controls/Panel3D/Panel3DObjectBrush.cs
+++ b/TombEditor/Controls/Panel3D/Panel3DObjectBrush.cs
@@ -3,6 +3,7 @@
 using System.Drawing;
 using System.Numerics;
 using System.Windows.Forms;
+using TombEditor.Features.Panel3D.ObjectBrush;
 using TombLib;
 using TombLib.LevelData;
 
@@ -54,7 +55,7 @@ private void SetBrushCursor(Vector3 worldPos, Room room)
         {
             float localX = worldPos.X - room.WorldPos.X;
             float localZ = worldPos.Z - room.WorldPos.Z;
-            float? floorH = ObjectBrush.Helper.GetFloorHeightAtPoint(room, localX, localZ);
+            float? floorH = Helpers.GetFloorHeightAtPoint(room, localX, localZ);
             float y = floorH.HasValue ? (floorH.Value + room.WorldPos.Y) : room.WorldPos.Y;
 
             _brushCursorPosition = new Vector3(worldPos.X, y, worldPos.Z);
@@ -68,12 +69,12 @@ private void SetBrushCursor(Vector3 worldPos, Room room)
         private void HandleBrushMouseUp()
         {
             if (_brushEngaged)
-                ObjectBrush.Actions.EndBrushStroke(_editor);
+				Actions.EndBrushStroke(_editor);
 
             _brushEngaged = false;
             _lastBrushWorldPosition = null;
             _lastBrushDirectionAngle = null;
-            ObjectBrush.Actions.MouseDirectionAngle = null;
+			Actions.MouseDirectionAngle = null;
         }
 
         // Returns true if the scroll event was consumed by the brush handler.
@@ -87,10 +88,10 @@ private bool HandleBrushWheelScroll(int delta, Point location)
             // Alt + mousewheel adjusts brush rotation.
             if (Control.ModifierKeys.HasFlag(Keys.Alt))
             {
-                float rotation = _editor.Configuration.ObjectBrush_Rotation + (delta > 0 ? ObjectBrush.Constants.AngleAdjustmentStep : -ObjectBrush.Constants.AngleAdjustmentStep);
+                float rotation = _editor.Configuration.ObjectBrush_Rotation + (delta > 0 ? Constants.AngleAdjustmentStep : -Constants.AngleAdjustmentStep);
                 rotation = ((rotation % 360.0f) + 360.0f) % 360.0f;
-                ObjectBrush.Actions.MouseDirectionAngle = _lastBrushDirectionAngle = _editor.Configuration.ObjectBrush_Rotation = 
-                    (float)(Math.Round(rotation / ObjectBrush.Constants.AngleAdjustmentStep) * ObjectBrush.Constants.AngleAdjustmentStep);
+                Actions.MouseDirectionAngle = _lastBrushDirectionAngle = _editor.Configuration.ObjectBrush_Rotation = 
+                    (float)(Math.Round(rotation / Constants.AngleAdjustmentStep) * Constants.AngleAdjustmentStep);
                 settingsChanged = true;
             }
 
@@ -102,16 +103,16 @@ private bool HandleBrushWheelScroll(int delta, Point location)
 
                     float density = _editor.Configuration.ObjectBrush_Density + (delta > 0 ? 0.1f : -0.1f);
                     _editor.Configuration.ObjectBrush_Density = 
-                        Math.Min(ObjectBrush.Constants.MaxDensity, Math.Max(ObjectBrush.Constants.MinDensity, (float)Math.Round(density, 1)));
+                        Math.Min(Constants.MaxDensity, Math.Max(Constants.MinDensity, (float)Math.Round(density, 1)));
                     settingsChanged = true;
                 }
                 else
                 {
                     // Shift + mousewheel adjusts brush radius.
 
-                    float radius = _editor.Configuration.ObjectBrush_Radius + (delta > 0 ? ObjectBrush.Constants.RadiusAdjustmentStep : -ObjectBrush.Constants.RadiusAdjustmentStep);
+                    float radius = _editor.Configuration.ObjectBrush_Radius + (delta > 0 ? Constants.RadiusAdjustmentStep : -Constants.RadiusAdjustmentStep);
                     _editor.Configuration.ObjectBrush_Radius =
-                        Math.Min(ObjectBrush.Constants.MaxRadius * Level.SectorSizeUnit, Math.Max(ObjectBrush.Constants.MinRadius * Level.SectorSizeUnit, radius));
+                        Math.Min(Constants.MaxRadius * Level.SectorSizeUnit, Math.Max(Constants.MinRadius * Level.SectorSizeUnit, radius));
                     settingsChanged = true;
                 }
             }
@@ -135,13 +136,13 @@ private void HandleObjectPlacementMouseDown(Point location)
 
             if (_editor.Tool.Tool == EditorToolType.Fill)
             {
-                // Fill executes immediately without brush engagement.
-                ObjectBrush.Actions.ExecuteFill(_editor, _editor.SelectedRoom);
+				// Fill executes immediately without brush engagement.
+				Actions.ExecuteFill(_editor, _editor.SelectedRoom);
             }
             else
             {
                 _brushEngaged = true;
-                _lastBrushWorldPosition = ObjectBrush.Actions.BeginBrushStroke(_editor, _editor.SelectedRoom, floorHit.Value.WorldPos);
+                _lastBrushWorldPosition = Actions.BeginBrushStroke(_editor, _editor.SelectedRoom, floorHit.Value.WorldPos);
             }
 
             Invalidate();
@@ -195,14 +196,14 @@ private bool HandleBrushMouseMove(Point location)
                 delta.Y = 0;
 
                 float proj = Vector3.Dot(delta, rotDir);
-                float spacing = ObjectBrush.Helper.ComputeLineSpacing(_editor);
+                float spacing = Helpers.ComputeLineSpacing(_editor);
 
                 if (proj < spacing)
                     return true;
 
                 // Snap to exact one-step advance from the last anchor for gapless tiling.
                 var snappedPos = _lastBrushWorldPosition.Value + rotDir * spacing;
-                bool painted = ObjectBrush.Actions.ContinueBrushStroke(_editor, _editor.SelectedRoom, snappedPos, null, spacing);
+                bool painted = Actions.ContinueBrushStroke(_editor, _editor.SelectedRoom, snappedPos, null, spacing);
 
                 if (painted)
                 {
@@ -215,7 +216,7 @@ private bool HandleBrushMouseMove(Point location)
                 // Track mouse movement direction for FollowMouseDirection mode.
                 UpdateMouseDirectionAngle(floorHit.Value.WorldPos);
 
-                bool painted = ObjectBrush.Actions.ContinueBrushStroke(_editor, _editor.SelectedRoom,
+                bool painted = Actions.ContinueBrushStroke(_editor, _editor.SelectedRoom,
                     floorHit.Value.WorldPos, _lastBrushWorldPosition, quantizationDistance);
 
                 if (painted)
@@ -254,7 +255,7 @@ private void UpdateMouseDirectionAngle(Vector3 currentPos)
             else
                 _lastBrushDirectionAngle = angle;
 
-            ObjectBrush.Actions.MouseDirectionAngle = _lastBrushDirectionAngle;
+			Actions.MouseDirectionAngle = _lastBrushDirectionAngle;
         }
 
         #endregion
@@ -292,7 +293,7 @@ internal bool UpdateBrushParameters(Point location, Vector3 cursorWorldPos)
             // Once exceeded, keep updating even if cursor moves back inside the deadzone.
             if (!_brushParamDeadzoneExceeded)
             {
-                if (screenDistance < ObjectBrush.Constants.ParamDeadzone)
+                if (screenDistance < Constants.ParamDeadzone)
                     return true;
 
                 _brushParamDeadzoneExceeded = true;
@@ -305,10 +306,10 @@ internal bool UpdateBrushParameters(Point location, Vector3 cursorWorldPos)
                 if (Control.ModifierKeys.HasFlag(Keys.Control))
                 {
                     // Ctrl+Shift: density scales with distance from pin point.
-                    var density = (screenDistance / this.Size.Height) * ObjectBrush.Constants.MaxDensity;
+                    var density = (screenDistance / this.Size.Height) * Constants.MaxDensity;
 
-                    _editor.Configuration.ObjectBrush_Density = Math.Min(ObjectBrush.Constants.MaxDensity, 
-                        Math.Max(ObjectBrush.Constants.MinDensity, density));
+                    _editor.Configuration.ObjectBrush_Density = Math.Min(Constants.MaxDensity, 
+                        Math.Max(Constants.MinDensity, density));
 
                     settingsChanged = true;
                 }
@@ -318,8 +319,8 @@ internal bool UpdateBrushParameters(Point location, Vector3 cursorWorldPos)
                     float distance = Vector2.Distance(new Vector2(cursorWorldPos.X, cursorWorldPos.Z),
                         new Vector2(_brushParamPinPoint.Value.X, _brushParamPinPoint.Value.Z));
 
-                    _editor.Configuration.ObjectBrush_Radius = Math.Min(ObjectBrush.Constants.MaxRadius * Level.SectorSizeUnit,
-                        Math.Max(ObjectBrush.Constants.MinRadius * Level.SectorSizeUnit, distance));
+                    _editor.Configuration.ObjectBrush_Radius = Math.Min(Constants.MaxRadius * Level.SectorSizeUnit,
+                        Math.Max(Constants.MinRadius * Level.SectorSizeUnit, distance));
 
                     settingsChanged = true;
                 }
@@ -386,7 +387,7 @@ private BrushOverlayState ComputeBrushOverlay(bool reset = false)
                     _editor.Tool.Tool != EditorToolType.Line &&
                     _editor.Tool.Tool != EditorToolType.Pencil)
                 {
-                    density = Math.Min(MaxBrushTransparency, Math.Max(MinBrushTransparency, _editor.Configuration.ObjectBrush_Density / ObjectBrush.Constants.MaxDensity));
+                    density = Math.Min(MaxBrushTransparency, Math.Max(MinBrushTransparency, _editor.Configuration.ObjectBrush_Density / Constants.MaxDensity));
                 }
 
                 var cursorPos = _brushCursorPosition.HasValue ? _brushCursorPosition.Value : Vector3.Zero;
diff --git a/TombEditor/Editor.cs b/TombEditor/Editor.cs
index 4fde87dcef..2d4c7a3024 100644
--- a/TombEditor/Editor.cs
+++ b/TombEditor/Editor.cs
@@ -6,7 +6,7 @@
 using System.Numerics;
 using System.Threading;
 using System.Threading.Tasks;
-using TombEditor.Controls.FlybyTimeline.Preview;
+using TombEditor.Features.FlybyTimeline.Preview;
 using TombLib;
 using TombLib.Forms;
 using TombLib.Graphics;
diff --git a/TombEditor/Features/DockableViews/ContentBrowser/AssetCategory.cs b/TombEditor/Features/DockableViews/ContentBrowser/AssetCategory.cs
new file mode 100644
index 0000000000..8424dbcc6f
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ContentBrowser/AssetCategory.cs
@@ -0,0 +1,12 @@
+namespace TombEditor.Features.DockableViews.ContentBrowser;
+
+/// <summary>
+/// Categories for filtering assets in the Content Browser.
+/// </summary>
+public enum AssetCategory
+{
+	All,
+	Moveables,
+	Statics,
+	ImportedGeometry
+}
diff --git a/TombEditor/Features/DockableViews/ContentBrowser/AssetItemViewModel.cs b/TombEditor/Features/DockableViews/ContentBrowser/AssetItemViewModel.cs
new file mode 100644
index 0000000000..f9636722d1
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ContentBrowser/AssetItemViewModel.cs
@@ -0,0 +1,185 @@
+#nullable enable
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Collections.Generic;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using TombLib.LevelData;
+using TombLib.Utils;
+using TombLib.Wad;
+
+namespace TombEditor.Features.DockableViews.ContentBrowser;
+
+/// <summary>
+/// ViewModel representing a single asset item in the Content Browser.
+/// </summary>
+public partial class AssetItemViewModel : ObservableObject
+{
+	/// <summary>
+	/// The underlying WAD object (WadMoveable, WadStatic, or ImportedGeometry).
+	/// </summary>
+	public IWadObject WadObject { get; }
+
+	// Display name of the asset.
+	public string Name { get; }
+
+	// Category this asset belongs to.
+	public AssetCategory Category { get; }
+
+	// Localized category display name for grouping.
+	public string CategoryName { get; }
+
+	// Name/path of the WAD file this asset was loaded from.
+	public string WadSource { get; }
+
+	// Whether this asset exists in multiple WAD files.
+	public bool IsInMultipleWads { get; }
+
+	// Catalog category string from TrCatalog (e.g. "Enemies", "Player").
+	// May contain multiple values for special cases like "Shatterable".
+	public string CatalogCategory { get; }
+
+	// Combined CategoryName + CatalogCategory for tooltip display.
+	public string CategoryDisplayText => string.IsNullOrEmpty(CatalogCategory) ? CategoryName : $"{CategoryName}, {CatalogCategory}";
+
+	// All effective categories including primary and any synthetic ones.
+	public List<string> EffectiveCategories { get; } = new();
+
+	// Color brush for placeholder thumbnail based on category.
+	public SolidColorBrush ThumbnailBrush { get; }
+
+	// Initials shown on the placeholder thumbnail.
+	public string Initials { get; }
+
+	// Sort order for type grouping (Moveables=0, Statics=1, ImportedGeometry=2).
+	public int CategoryOrder => Category switch
+	{
+		AssetCategory.Moveables => 0,
+		AssetCategory.Statics => 1,
+		AssetCategory.ImportedGeometry => 2,
+		_ => 3
+	};
+
+	// Unique key used for favorites persistence.
+	public string FavoriteKey { get; }
+
+	// Whether this item is marked as a favorite.
+	[ObservableProperty]
+	private bool _isFavorite;
+
+	// Backing field for thumbnail property.
+	[ObservableProperty]
+	[NotifyPropertyChangedFor(nameof(HasThumbnail))]
+	private BitmapSource? _thumbnail;
+
+	// Whether a rendered thumbnail has been set.
+	public bool HasThumbnail => Thumbnail is not null;
+
+	// True while covered by rubber-band selection; purely visual feedback.
+	[ObservableProperty]
+	private bool _isRubberBandSelected;
+
+	// Unique cache key for this asset's thumbnail.
+	public string CacheKey { get; }
+
+	private static readonly SolidColorBrush MoveableBrush = new(Color.FromRgb(0x4B, 0x6E, 0xAF));
+	private static readonly SolidColorBrush StaticBrush = new(Color.FromRgb(0x5A, 0x8C, 0x46));
+	private static readonly SolidColorBrush ImportedGeometryBrush = new(Color.FromRgb(0xC0, 0x7B, 0x38));
+
+	static AssetItemViewModel()
+	{
+		MoveableBrush.Freeze();
+		StaticBrush.Freeze();
+		ImportedGeometryBrush.Freeze();
+	}
+
+	public AssetItemViewModel(IWadObject wadObject, string name, AssetCategory category, string categoryName, string wadSource,
+		bool isInMultipleWads, string catalogCategory = "", string fileVersion = "")
+	{
+		WadObject = wadObject;
+		Name = name;
+		Category = category;
+		CategoryName = categoryName;
+		WadSource = wadSource;
+		IsInMultipleWads = isInMultipleWads;
+		CatalogCategory = catalogCategory;
+
+		ThumbnailBrush = category switch
+		{
+			AssetCategory.Moveables => MoveableBrush,
+			AssetCategory.Statics => StaticBrush,
+			AssetCategory.ImportedGeometry => ImportedGeometryBrush,
+			_ => MoveableBrush
+		};
+
+		Initials = BuildInitials(name);
+		CacheKey = BuildCacheKey(wadObject, category, fileVersion);
+		FavoriteKey = BuildFavoriteKey(wadObject, category);
+	}
+
+	public static string BuildFavoriteKey(IWadObject wadObject, AssetCategory category)
+	{
+		string prefix = category.ToString();
+
+		if (wadObject.Id is WadMoveableId movId)
+			return $"{prefix}_{movId.TypeId}";
+
+		if (wadObject.Id is WadStaticId statId)
+			return $"{prefix}_{statId.TypeId}";
+
+		if (wadObject is ImportedGeometry geo)
+			return $"{prefix}_{geo.Info.Name}_{geo.Info.Path}";
+
+		return $"{prefix}_{wadObject.GetHashCode()}";
+	}
+
+	private static string BuildCacheKey(IWadObject wadObject, AssetCategory category, string fileVersion = "")
+	{
+		string prefix = category.ToString();
+		var versionSuffix = string.IsNullOrEmpty(fileVersion) ? string.Empty : $"_{fileVersion}";
+
+		if (wadObject.Id is not null)
+			return $"{prefix}_{wadObject.Id}{versionSuffix}";
+
+		if (wadObject is ImportedGeometry geo)
+			return $"{prefix}_{geo.GetHashCode()}{versionSuffix}";
+
+		return $"{prefix}_{wadObject.GetHashCode()}{versionSuffix}";
+	}
+
+	// Converts an ImageC (BGRA byte array) to a frozen WPF BitmapSource.
+	public static BitmapSource? ImageCToBitmapSource(ImageC image)
+	{
+		if (image.Width == 0 || image.Height == 0)
+			return null;
+
+		byte[] data = image.ToByteArray();
+		int stride = image.Width * 4; // BGRA = 4 bytes per pixel.
+		var bmp = BitmapSource.Create(image.Width, image.Height, 96, 96, PixelFormats.Bgra32, null, data, stride);
+		bmp.Freeze();
+		return bmp;
+	}
+
+	private static string BuildInitials(string name)
+	{
+		if (string.IsNullOrWhiteSpace(name))
+			return "?";
+
+		var cleaned = name.Trim();
+
+		// Skip leading "(number) " prefix, e.g. "(100) WOLF" -> "WOLF".
+		if (cleaned.Length > 0 && cleaned[0] == '(')
+		{
+			int closeIdx = cleaned.IndexOf(')');
+
+			if (closeIdx > 0 && closeIdx + 1 < cleaned.Length)
+				cleaned = cleaned[(closeIdx + 1)..].TrimStart();
+		}
+
+		if (string.IsNullOrEmpty(cleaned))
+			return "?";
+
+		// Use the first letter of the cleaned name.
+		return cleaned[0].ToString().ToUpperInvariant();
+	}
+}
diff --git a/TombEditor/ToolWindows/ContentBrowser.Designer.cs b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowser.Designer.cs
similarity index 89%
rename from TombEditor/ToolWindows/ContentBrowser.Designer.cs
rename to TombEditor/Features/DockableViews/ContentBrowser/ContentBrowser.Designer.cs
index 59b6a0911d..117044624d 100644
--- a/TombEditor/ToolWindows/ContentBrowser.Designer.cs
+++ b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowser.Designer.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.ContentBrowser
 {
     partial class ContentBrowser
     {
@@ -9,7 +9,7 @@ private void InitializeComponent()
             this.components = new System.ComponentModel.Container();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.elementHost = new System.Windows.Forms.Integration.ElementHost();
-            this.contentBrowserView = new Views.ContentBrowserView();
+            this.contentBrowserView = new ContentBrowserView();
             this.SuspendLayout();
             // 
             // elementHost
@@ -36,6 +36,6 @@ private void InitializeComponent()
 
         private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.Integration.ElementHost elementHost;
-        private Views.ContentBrowserView contentBrowserView;
+        private ContentBrowserView contentBrowserView;
     }
 }
diff --git a/TombEditor/ToolWindows/ContentBrowser.cs b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowser.cs
similarity index 99%
rename from TombEditor/ToolWindows/ContentBrowser.cs
rename to TombEditor/Features/DockableViews/ContentBrowser/ContentBrowser.cs
index b078b1f346..8e6bc5782b 100644
--- a/TombEditor/ToolWindows/ContentBrowser.cs
+++ b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowser.cs
@@ -5,14 +5,13 @@
 using System.ComponentModel;
 using System.Linq;
 using System.Windows.Forms;
-using TombEditor.ViewModels;
 using TombLib.Controls;
 using TombLib.GeometryIO;
 using TombLib.LevelData;
 using TombLib.Utils;
 using TombLib.Wad;
 
-namespace TombEditor.ToolWindows;
+namespace TombEditor.Features.DockableViews.ContentBrowser;
 
 public partial class ContentBrowser : DarkToolWindow
 {
diff --git a/TombEditor/Views/ContentBrowserView.xaml b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserView.xaml
similarity index 97%
rename from TombEditor/Views/ContentBrowserView.xaml
rename to TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserView.xaml
index 22a4ac24e4..cd1f8e6fa0 100644
--- a/TombEditor/Views/ContentBrowserView.xaml
+++ b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserView.xaml
@@ -1,16 +1,15 @@
 <UserControl
-	x:Class="TombEditor.Views.ContentBrowserView"
+	x:Class="TombEditor.Features.DockableViews.ContentBrowser.ContentBrowserView"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
 	xmlns:converters="clr-namespace:DarkUI.WPF.Converters;assembly=DarkUI.WPF"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
-	xmlns:local="clr-namespace:TombEditor.Views"
+	xmlns:local="clr-namespace:TombEditor.Features.DockableViews.ContentBrowser"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
-	xmlns:viewModels="clr-namespace:TombEditor.ViewModels"
-	d:DataContext="{d:DesignInstance Type=viewModels:ContentBrowserViewModel}"
+	d:DataContext="{d:DesignInstance Type=local:ContentBrowserViewModel}"
 	d:DesignHeight="400"
 	d:DesignWidth="350"
 	Background="{DynamicResource Brush_Background}"
@@ -23,7 +22,7 @@
 		<converters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisConverter" />
 
 		<!--  Asset tile item template  -->
-		<DataTemplate x:Key="AssetTileTemplate" DataType="{x:Type viewModels:AssetItemViewModel}">
+		<DataTemplate x:Key="AssetTileTemplate" DataType="{x:Type local:AssetItemViewModel}">
 			<Border
 				x:Name="TileBorder"
 				Width="{Binding DataContext.TileWidth, RelativeSource={RelativeSource AncestorType=UserControl}}"
diff --git a/TombEditor/Views/ContentBrowserView.xaml.cs b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserView.xaml.cs
similarity index 99%
rename from TombEditor/Views/ContentBrowserView.xaml.cs
rename to TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserView.xaml.cs
index 3885c3fec8..10f5732d6b 100644
--- a/TombEditor/Views/ContentBrowserView.xaml.cs
+++ b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserView.xaml.cs
@@ -10,9 +10,8 @@
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using TombEditor.ViewModels;
 
-namespace TombEditor.Views;
+namespace TombEditor.Features.DockableViews.ContentBrowser;
 
 public partial class ContentBrowserView : UserControl
 {
diff --git a/TombEditor/ViewModels/ContentBrowserViewModel.cs b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserViewModel.cs
similarity index 72%
rename from TombEditor/ViewModels/ContentBrowserViewModel.cs
rename to TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserViewModel.cs
index c606d1b352..099d4b9051 100644
--- a/TombEditor/ViewModels/ContentBrowserViewModel.cs
+++ b/TombEditor/Features/DockableViews/ContentBrowser/ContentBrowserViewModel.cs
@@ -12,7 +12,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Data;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using TombLib.LevelData;
 using TombLib.Utils;
@@ -21,255 +20,7 @@
 using TombLib.WPF.Services;
 using TombLib.WPF.Services.Abstract;
 
-namespace TombEditor.ViewModels;
-
-/// <summary>
-/// Categories for filtering assets in the Content Browser.
-/// </summary>
-public enum AssetCategory
-{
-	All,
-	Moveables,
-	Statics,
-	ImportedGeometry
-}
-
-/// <summary>
-/// Represents a single entry in the filter combobox.
-/// Can be a type filter (All/Moveables/Statics/ImportedGeometry),
-/// a category filter (from TrCatalog), or a visual splitter.
-/// </summary>
-public sealed class FilterOption
-{
-	/// <summary>
-	/// Display name shown in the combobox.
-	/// </summary>
-	public string DisplayName { get; }
-
-	/// <summary>
-	/// True if this is a type-based filter (All, Moveables, Statics, ImportedGeometry).
-	/// </summary>
-	public bool IsTypeFilter { get; }
-
-	/// <summary>
-	/// True if this is a non-selectable visual separator.
-	/// </summary>
-	public bool IsSplitter { get; }
-
-	/// <summary>
-	/// True if this is the special "Favorites" filter.
-	/// </summary>
-	public bool IsFavoritesFilter { get; }
-
-	/// <summary>
-	/// The type filter value, only meaningful when IsTypeFilter is true.
-	/// </summary>
-	public AssetCategory TypeFilter { get; }
-
-	/// <summary>
-	/// The category name for category-based filtering.
-	/// Only meaningful when IsTypeFilter is false and IsSplitter is false.
-	/// </summary>
-	public string CategoryFilter { get; }
-
-	private FilterOption(string displayName, bool isTypeFilter, bool isSplitter, bool isFavoritesFilter, AssetCategory typeFilter, string categoryFilter)
-	{
-		DisplayName = displayName;
-		IsTypeFilter = isTypeFilter;
-		IsSplitter = isSplitter;
-		IsFavoritesFilter = isFavoritesFilter;
-		TypeFilter = typeFilter;
-		CategoryFilter = categoryFilter;
-	}
-
-	public static FilterOption CreateTypeFilter(AssetCategory category, string displayName)
-		=> new(displayName, true, false, false, category, string.Empty);
-
-	public static FilterOption CreateSplitter()
-		=> new(string.Empty, false, true, false, AssetCategory.All, string.Empty);
-
-	public static FilterOption CreateCategoryFilter(string categoryName)
-		=> new(categoryName, false, false, false, AssetCategory.All, categoryName);
-
-	public static FilterOption CreateFavoritesFilter(string displayName)
-		=> new(displayName, false, false, true, AssetCategory.All, string.Empty);
-
-	public override string ToString() => DisplayName;
-}
-
-/// <summary>
-/// ViewModel representing a single asset item in the Content Browser.
-/// </summary>
-public partial class AssetItemViewModel : ObservableObject
-{
-	/// <summary>
-	/// The underlying WAD object (WadMoveable, WadStatic, or ImportedGeometry).
-	/// </summary>
-	public IWadObject WadObject { get; }
-
-	// Display name of the asset.
-	public string Name { get; }
-
-	// Category this asset belongs to.
-	public AssetCategory Category { get; }
-
-	// Localized category display name for grouping.
-	public string CategoryName { get; }
-
-	// Name/path of the WAD file this asset was loaded from.
-	public string WadSource { get; }
-
-	// Whether this asset exists in multiple WAD files.
-	public bool IsInMultipleWads { get; }
-
-	// Catalog category string from TrCatalog (e.g. "Enemies", "Player").
-	// May contain multiple values for special cases like "Shatterable".
-	public string CatalogCategory { get; }
-
-	// Combined CategoryName + CatalogCategory for tooltip display.
-	public string CategoryDisplayText => string.IsNullOrEmpty(CatalogCategory) ? CategoryName : $"{CategoryName}, {CatalogCategory}";
-
-	// All effective categories including primary and any synthetic ones.
-	public List<string> EffectiveCategories { get; } = new();
-
-	// Color brush for placeholder thumbnail based on category.
-	public SolidColorBrush ThumbnailBrush { get; }
-
-	// Initials shown on the placeholder thumbnail.
-	public string Initials { get; }
-
-	// Sort order for type grouping (Moveables=0, Statics=1, ImportedGeometry=2).
-	public int CategoryOrder => Category switch
-	{
-		AssetCategory.Moveables => 0,
-		AssetCategory.Statics => 1,
-		AssetCategory.ImportedGeometry => 2,
-		_ => 3
-	};
-
-	// Unique key used for favorites persistence.
-	public string FavoriteKey { get; }
-
-	// Whether this item is marked as a favorite.
-	[ObservableProperty]
-	private bool _isFavorite;
-
-	// Backing field for thumbnail property.
-	[ObservableProperty]
-	[NotifyPropertyChangedFor(nameof(HasThumbnail))]
-	private BitmapSource? _thumbnail;
-
-	// Whether a rendered thumbnail has been set.
-	public bool HasThumbnail => Thumbnail is not null;
-
-	// True while covered by rubber-band selection; purely visual feedback.
-	[ObservableProperty]
-	private bool _isRubberBandSelected;
-
-	// Unique cache key for this asset's thumbnail.
-	public string CacheKey { get; }
-
-	private static readonly SolidColorBrush MoveableBrush = new(Color.FromRgb(0x4B, 0x6E, 0xAF));
-	private static readonly SolidColorBrush StaticBrush = new(Color.FromRgb(0x5A, 0x8C, 0x46));
-	private static readonly SolidColorBrush ImportedGeometryBrush = new(Color.FromRgb(0xC0, 0x7B, 0x38));
-
-	static AssetItemViewModel()
-	{
-		MoveableBrush.Freeze();
-		StaticBrush.Freeze();
-		ImportedGeometryBrush.Freeze();
-	}
-
-	public AssetItemViewModel(IWadObject wadObject, string name, AssetCategory category, string categoryName, string wadSource,
-		bool isInMultipleWads, string catalogCategory = "", string fileVersion = "")
-	{
-		WadObject = wadObject;
-		Name = name;
-		Category = category;
-		CategoryName = categoryName;
-		WadSource = wadSource;
-		IsInMultipleWads = isInMultipleWads;
-		CatalogCategory = catalogCategory;
-
-		ThumbnailBrush = category switch
-		{
-			AssetCategory.Moveables => MoveableBrush,
-			AssetCategory.Statics => StaticBrush,
-			AssetCategory.ImportedGeometry => ImportedGeometryBrush,
-			_ => MoveableBrush
-		};
-
-		Initials = BuildInitials(name);
-		CacheKey = BuildCacheKey(wadObject, category, fileVersion);
-		FavoriteKey = BuildFavoriteKey(wadObject, category);
-	}
-
-	public static string BuildFavoriteKey(IWadObject wadObject, AssetCategory category)
-	{
-		string prefix = category.ToString();
-
-		if (wadObject.Id is WadMoveableId movId)
-			return $"{prefix}_{movId.TypeId}";
-
-		if (wadObject.Id is WadStaticId statId)
-			return $"{prefix}_{statId.TypeId}";
-
-		if (wadObject is ImportedGeometry geo)
-			return $"{prefix}_{geo.Info.Name}_{geo.Info.Path}";
-
-		return $"{prefix}_{wadObject.GetHashCode()}";
-	}
-
-	private static string BuildCacheKey(IWadObject wadObject, AssetCategory category, string fileVersion = "")
-	{
-		string prefix = category.ToString();
-		var versionSuffix = string.IsNullOrEmpty(fileVersion) ? string.Empty : $"_{fileVersion}";
-
-		if (wadObject.Id is not null)
-			return $"{prefix}_{wadObject.Id}{versionSuffix}";
-
-		if (wadObject is ImportedGeometry geo)
-			return $"{prefix}_{geo.GetHashCode()}{versionSuffix}";
-
-		return $"{prefix}_{wadObject.GetHashCode()}{versionSuffix}";
-	}
-
-	// Converts an ImageC (BGRA byte array) to a frozen WPF BitmapSource.
-	public static BitmapSource? ImageCToBitmapSource(ImageC image)
-	{
-		if (image.Width == 0 || image.Height == 0)
-			return null;
-
-		byte[] data = image.ToByteArray();
-		int stride = image.Width * 4; // BGRA = 4 bytes per pixel.
-		var bmp = BitmapSource.Create(image.Width, image.Height, 96, 96, PixelFormats.Bgra32, null, data, stride);
-		bmp.Freeze();
-		return bmp;
-	}
-
-	private static string BuildInitials(string name)
-	{
-		if (string.IsNullOrWhiteSpace(name))
-			return "?";
-
-		var cleaned = name.Trim();
-
-		// Skip leading "(number) " prefix, e.g. "(100) WOLF" -> "WOLF".
-		if (cleaned.Length > 0 && cleaned[0] == '(')
-		{
-			int closeIdx = cleaned.IndexOf(')');
-
-			if (closeIdx > 0 && closeIdx + 1 < cleaned.Length)
-				cleaned = cleaned[(closeIdx + 1)..].TrimStart();
-		}
-
-		if (string.IsNullOrEmpty(cleaned))
-			return "?";
-
-		// Use the first letter of the cleaned name.
-		return cleaned[0].ToString().ToUpperInvariant();
-	}
-}
+namespace TombEditor.Features.DockableViews.ContentBrowser;
 
 /// <summary>
 /// Main ViewModel for the Content Browser tool window.
diff --git a/TombEditor/Features/DockableViews/ContentBrowser/FilterOption.cs b/TombEditor/Features/DockableViews/ContentBrowser/FilterOption.cs
new file mode 100644
index 0000000000..b799c10618
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ContentBrowser/FilterOption.cs
@@ -0,0 +1,66 @@
+#nullable enable
+
+namespace TombEditor.Features.DockableViews.ContentBrowser;
+
+/// <summary>
+/// Represents a single entry in the filter combobox.
+/// Can be a type filter (All/Moveables/Statics/ImportedGeometry),
+/// a category filter (from TrCatalog), or a visual splitter.
+/// </summary>
+public sealed class FilterOption
+{
+	/// <summary>
+	/// Display name shown in the combobox.
+	/// </summary>
+	public string DisplayName { get; }
+
+	/// <summary>
+	/// True if this is a type-based filter (All, Moveables, Statics, ImportedGeometry).
+	/// </summary>
+	public bool IsTypeFilter { get; }
+
+	/// <summary>
+	/// True if this is a non-selectable visual separator.
+	/// </summary>
+	public bool IsSplitter { get; }
+
+	/// <summary>
+	/// True if this is the special "Favorites" filter.
+	/// </summary>
+	public bool IsFavoritesFilter { get; }
+
+	/// <summary>
+	/// The type filter value, only meaningful when IsTypeFilter is true.
+	/// </summary>
+	public AssetCategory TypeFilter { get; }
+
+	/// <summary>
+	/// The category name for category-based filtering.
+	/// Only meaningful when IsTypeFilter is false and IsSplitter is false.
+	/// </summary>
+	public string CategoryFilter { get; }
+
+	private FilterOption(string displayName, bool isTypeFilter, bool isSplitter, bool isFavoritesFilter, AssetCategory typeFilter, string categoryFilter)
+	{
+		DisplayName = displayName;
+		IsTypeFilter = isTypeFilter;
+		IsSplitter = isSplitter;
+		IsFavoritesFilter = isFavoritesFilter;
+		TypeFilter = typeFilter;
+		CategoryFilter = categoryFilter;
+	}
+
+	public static FilterOption CreateTypeFilter(AssetCategory category, string displayName)
+		=> new(displayName, true, false, false, category, string.Empty);
+
+	public static FilterOption CreateSplitter()
+		=> new(string.Empty, false, true, false, AssetCategory.All, string.Empty);
+
+	public static FilterOption CreateCategoryFilter(string categoryName)
+		=> new(categoryName, false, false, false, AssetCategory.All, categoryName);
+
+	public static FilterOption CreateFavoritesFilter(string displayName)
+		=> new(displayName, false, false, true, AssetCategory.All, string.Empty);
+
+	public override string ToString() => DisplayName;
+}
diff --git a/TombEditor/ToolWindows/ImportedGeometryBrowser.Designer.cs b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowser.Designer.cs
similarity index 99%
rename from TombEditor/ToolWindows/ImportedGeometryBrowser.Designer.cs
rename to TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowser.Designer.cs
index 33e21e86dd..f653a43e3e 100644
--- a/TombEditor/ToolWindows/ImportedGeometryBrowser.Designer.cs
+++ b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowser.Designer.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.ImportedGeometryBrowser
 {
     partial class ImportedGeometryBrowser
     {
@@ -167,6 +167,7 @@ private void InitializeComponent()
         }
 
         #endregion
+
         private Controls.PanelRenderingImportedGeometry panelItem;
         private System.Windows.Forms.Panel panelHeader;
         private System.Windows.Forms.Panel panelRightBottom;
diff --git a/TombEditor/ToolWindows/ImportedGeometryBrowser.cs b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowser.cs
similarity index 98%
rename from TombEditor/ToolWindows/ImportedGeometryBrowser.cs
rename to TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowser.cs
index 313be6aca3..4935a7a2ff 100644
--- a/TombEditor/ToolWindows/ImportedGeometryBrowser.cs
+++ b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowser.cs
@@ -6,7 +6,7 @@
 using TombLib.Rendering;
 using TombLib.Wad;
 
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.ImportedGeometryBrowser
 {
     public partial class ImportedGeometryBrowser : DarkToolWindow
     {
diff --git a/TombEditor/ToolWindows/ImportedGeometryBrowser.resx b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowser.resx
similarity index 100%
rename from TombEditor/ToolWindows/ImportedGeometryBrowser.resx
rename to TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowser.resx
diff --git a/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowserView.xaml b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowserView.xaml
new file mode 100644
index 0000000000..6270e44959
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowserView.xaml
@@ -0,0 +1,62 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.ImportedGeometryBrowser.ImportedGeometryBrowserView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
+	d:DesignHeight="250"
+	d:DesignWidth="285"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<controls:SpacedGrid Margin="{x:Static darkUI:Defaults.SmallThickness}" RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<controls:SpacedGrid ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+
+			<controls:SearchableComboBox />
+
+			<Button Grid.Column="1" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_plus_math-16.png" />
+			</Button>
+		</controls:SpacedGrid>
+
+		<WindowsFormsHost x:Name="ItemPreviewHost" Grid.Row="1" />
+
+		<controls:SpacedGrid Grid.Row="2" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+
+			<Button Grid.Column="1" Style="{DynamicResource ButtonWithIconAndText}">
+				<StackPanel Orientation="Horizontal">
+					<Image Source="/TombEditor;component/Resources/icons_general/general_target-16.png" />
+					<TextBlock Text="{tombLib:Localize LocateItem}" />
+				</StackPanel>
+			</Button>
+
+			<Button Grid.Column="2" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_ArrowUp-16.png" />
+			</Button>
+
+			<Button Grid.Column="3" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_ArrowDown-16.png" />
+			</Button>
+		</controls:SpacedGrid>
+	</controls:SpacedGrid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowserView.xaml.cs b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowserView.xaml.cs
new file mode 100644
index 0000000000..5dd88c735a
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ImportedGeometryBrowser/ImportedGeometryBrowserView.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace TombEditor.Features.DockableViews.ImportedGeometryBrowser;
+
+public partial class ImportedGeometryBrowserView : UserControl
+{
+	public ImportedGeometryBrowserView()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/TombEditor/ToolWindows/ItemBrowser.Designer.cs b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowser.Designer.cs
similarity index 99%
rename from TombEditor/ToolWindows/ItemBrowser.Designer.cs
rename to TombEditor/Features/DockableViews/ItemBrowser/ItemBrowser.Designer.cs
index a1e6492f85..e3337f73b1 100644
--- a/TombEditor/ToolWindows/ItemBrowser.Designer.cs
+++ b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowser.Designer.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.ItemBrowser
 {
     partial class ItemBrowser
     {
@@ -181,6 +181,7 @@ private void InitializeComponent()
         }
 
         #endregion
+
         private DarkUI.Controls.DarkButton butFindItem;
         private Controls.PanelRenderingItem panelItem;
         private System.Windows.Forms.Panel panelHeader;
diff --git a/TombEditor/ToolWindows/ItemBrowser.cs b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowser.cs
similarity index 99%
rename from TombEditor/ToolWindows/ItemBrowser.cs
rename to TombEditor/Features/DockableViews/ItemBrowser/ItemBrowser.cs
index 5ce4674e51..562a0b031b 100644
--- a/TombEditor/ToolWindows/ItemBrowser.cs
+++ b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowser.cs
@@ -8,7 +8,7 @@
 using TombLib.Wad;
 using TombLib.Wad.Catalog;
 
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.ItemBrowser
 {
     public partial class ItemBrowser : DarkToolWindow
     {
@@ -56,7 +56,7 @@ obj is Editor.GameVersionChangedEvent ||
                     if (!_editor.Configuration.RenderingItem_HideInternalObjects ||
                         !TrCatalog.IsHidden(_editor.Level.Settings.GameVersion, moveable.Id.TypeId))
                         comboItems.Items.Add(moveable);
-                
+
                 foreach (var staticMesh in allStatics.Values)
                     comboItems.Items.Add(staticMesh);
 
diff --git a/TombEditor/ToolWindows/ItemBrowser.resx b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowser.resx
similarity index 100%
rename from TombEditor/ToolWindows/ItemBrowser.resx
rename to TombEditor/Features/DockableViews/ItemBrowser/ItemBrowser.resx
diff --git a/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowserView.xaml b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowserView.xaml
new file mode 100644
index 0000000000..7d9242e6c7
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowserView.xaml
@@ -0,0 +1,69 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.ItemBrowser.ItemBrowserView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
+	d:DesignHeight="250"
+	d:DesignWidth="285"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<controls:SpacedGrid Margin="{x:Static darkUI:Defaults.SmallThickness}" RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<controls:SpacedGrid ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+
+			<controls:SearchableComboBox />
+
+			<Button Grid.Column="1" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_plus_math-16.png" />
+			</Button>
+		</controls:SpacedGrid>
+
+		<WindowsFormsHost x:Name="ItemPreviewHost" Grid.Row="1" />
+
+		<controls:SpacedGrid Grid.Row="2" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+
+			<Border BorderBrush="{DynamicResource Brush_Border}" BorderThickness="{x:Static darkUI:Defaults.BorderThickness}">
+				<Label
+					x:Name="lblFromWad"
+					Content="PLACEHOLDER TEXT"
+					Style="{DynamicResource ExtraHorizontalMarginLabel}" />
+			</Border>
+
+			<Button Grid.Column="1" Style="{DynamicResource ButtonWithIconAndText}">
+				<StackPanel Orientation="Horizontal">
+					<Image Source="/TombEditor;component/Resources/icons_general/general_target-16.png" />
+					<TextBlock Text="{tombLib:Localize LocateItem}" />
+				</StackPanel>
+			</Button>
+
+			<Button Grid.Column="2" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_ArrowUp-16.png" />
+			</Button>
+
+			<Button Grid.Column="3" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_ArrowDown-16.png" />
+			</Button>
+		</controls:SpacedGrid>
+	</controls:SpacedGrid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowserView.xaml.cs b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowserView.xaml.cs
new file mode 100644
index 0000000000..dd0575240e
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ItemBrowser/ItemBrowserView.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace TombEditor.Features.DockableViews.ItemBrowser;
+
+public partial class ItemBrowserView : UserControl
+{
+	public ItemBrowserView()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/TombEditor/Features/DockableViews/LightingPanel/Lighting.Designer.cs b/TombEditor/Features/DockableViews/LightingPanel/Lighting.Designer.cs
new file mode 100644
index 0000000000..6d8e31be15
--- /dev/null
+++ b/TombEditor/Features/DockableViews/LightingPanel/Lighting.Designer.cs
@@ -0,0 +1,40 @@
+namespace TombEditor.Features.DockableViews.LightingPanel
+{
+    partial class Lighting
+    {
+        private System.ComponentModel.IContainer components = null;
+
+        #region Component Designer generated code
+
+        private void InitializeComponent()
+        {
+            _elementHost = new System.Windows.Forms.Integration.ElementHost();
+            _lightingView = new LightingView();
+            SuspendLayout();
+            // 
+            // _elementHost
+            // 
+            _elementHost.Dock = System.Windows.Forms.DockStyle.Fill;
+            _elementHost.Name = "_elementHost";
+            _elementHost.Child = _lightingView;
+            // 
+            // Lighting
+            // 
+            AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            Controls.Add(_elementHost);
+            DefaultDockArea = DarkUI.Docking.DarkDockArea.Bottom;
+            DockText = "Lighting";
+            MinimumSize = new System.Drawing.Size(371, 141);
+            Name = "Lighting";
+            SerializationKey = "Lighting";
+            Size = new System.Drawing.Size(371, 141);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Integration.ElementHost _elementHost;
+        private LightingView _lightingView;
+    }
+}
diff --git a/TombEditor/Features/DockableViews/LightingPanel/Lighting.cs b/TombEditor/Features/DockableViews/LightingPanel/Lighting.cs
new file mode 100644
index 0000000000..a5fa21ee1d
--- /dev/null
+++ b/TombEditor/Features/DockableViews/LightingPanel/Lighting.cs
@@ -0,0 +1,22 @@
+using DarkUI.Docking;
+
+namespace TombEditor.Features.DockableViews.LightingPanel;
+
+public partial class Lighting : DarkToolWindow
+{
+	public Lighting()
+	{
+		InitializeComponent();
+	}
+
+	protected override void Dispose(bool disposing)
+	{
+		if (disposing)
+		{
+			_lightingView?.Cleanup();
+			components?.Dispose();
+		}
+
+		base.Dispose(disposing);
+	}
+}
diff --git a/TombEditor/ToolWindows/Lighting.resx b/TombEditor/Features/DockableViews/LightingPanel/Lighting.resx
similarity index 100%
rename from TombEditor/ToolWindows/Lighting.resx
rename to TombEditor/Features/DockableViews/LightingPanel/Lighting.resx
diff --git a/TombEditor/Features/DockableViews/LightingPanel/LightingView.xaml b/TombEditor/Features/DockableViews/LightingPanel/LightingView.xaml
new file mode 100644
index 0000000000..cecff587ae
--- /dev/null
+++ b/TombEditor/Features/DockableViews/LightingPanel/LightingView.xaml
@@ -0,0 +1,286 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.LightingPanel.LightingView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
+	d:DesignHeight="120"
+	d:DesignWidth="375"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<controls:SpacedGrid Margin="{x:Static darkUI:Defaults.SmallThickness}" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition />
+		</Grid.ColumnDefinitions>
+
+		<controls:SpacedGrid RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition />
+			</Grid.RowDefinitions>
+
+			<controls:SpacedGrid RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+				</Grid.RowDefinitions>
+
+				<controls:SpacedGrid ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+
+					<ComboBox SelectedIndex="{Binding SelectedLightType}">
+						<ComboBoxItem Style="{DynamicResource ComboBoxItemWithIconAndText}">
+							<StackPanel Orientation="Horizontal">
+								<Image Source="/TombEditor;component/Resources/icons_objects/objects_LightPoint-16.png" />
+								<TextBlock Text="{tombLib:Localize TypePoint}" />
+							</StackPanel>
+						</ComboBoxItem>
+
+						<ComboBoxItem Style="{DynamicResource ComboBoxItemWithIconAndText}">
+							<StackPanel Orientation="Horizontal">
+								<Image Source="/TombEditor;component/Resources/icons_objects/objects_Shadow-16.png" />
+								<TextBlock Text="{tombLib:Localize TypeShadow}" />
+							</StackPanel>
+						</ComboBoxItem>
+
+						<ComboBoxItem Style="{DynamicResource ComboBoxItemWithIconAndText}">
+							<StackPanel Orientation="Horizontal">
+								<Image Source="/TombEditor;component/Resources/icons_objects/objects_Spotlight-16.png" />
+								<TextBlock Text="{tombLib:Localize TypeSpot}" />
+							</StackPanel>
+						</ComboBoxItem>
+
+						<ComboBoxItem Style="{DynamicResource ComboBoxItemWithIconAndText}">
+							<StackPanel Orientation="Horizontal">
+								<Image Source="/TombEditor;component/Resources/icons_objects/objects_Effect-16.png" />
+								<TextBlock Text="{tombLib:Localize TypeEffect}" />
+							</StackPanel>
+						</ComboBoxItem>
+
+						<ComboBoxItem Style="{DynamicResource ComboBoxItemWithIconAndText}">
+							<StackPanel Orientation="Horizontal">
+								<Image Source="/TombEditor;component/Resources/icons_objects/objects_sun-16.png" />
+								<TextBlock Text="{tombLib:Localize TypeSun}" />
+							</StackPanel>
+						</ComboBoxItem>
+
+						<ComboBoxItem Style="{DynamicResource ComboBoxItemWithIconAndText}">
+							<StackPanel Orientation="Horizontal">
+								<Image Source="/TombEditor;component/Resources/icons_objects/objects_Fog-16.png" />
+								<TextBlock Text="{tombLib:Localize TypeFogBulb}" />
+							</StackPanel>
+						</ComboBoxItem>
+					</ComboBox>
+
+					<Button
+						Grid.Column="1"
+						Command="{Binding AddLightCommand}"
+						Style="{DynamicResource ButtonWithIconOnly}">
+						<Image Source="/TombEditor;component/Resources/icons_general/general_plus_math-16.png" />
+					</Button>
+				</controls:SpacedGrid>
+
+				<ComboBox
+					Grid.Row="1"
+					Grid.ColumnSpan="2"
+					IsEnabled="{Binding CanEditQuality}"
+					SelectedIndex="{Binding SelectedLightQuality}">
+					<ComboBoxItem Content="{tombLib:Localize QualityDefault}" />
+					<ComboBoxItem Content="{tombLib:Localize QualityLow}" />
+					<ComboBoxItem Content="{tombLib:Localize QualityMedium}" />
+					<ComboBoxItem Content="{tombLib:Localize QualityHigh}" />
+				</ComboBox>
+			</controls:SpacedGrid>
+
+			<controls:SpacedGrid
+				Grid.Row="1"
+				ColumnSpacing="{x:Static darkUI:Defaults.LargeThicknessWidth}"
+				RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition />
+				</Grid.ColumnDefinitions>
+
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+
+				<CheckBox
+					Content="{tombLib:Localize Enabled}"
+					IsChecked="{Binding LightEnabled}"
+					IsEnabled="{Binding HasLight}" />
+				<CheckBox
+					Grid.Row="1"
+					Content="{tombLib:Localize Obstruct}"
+					IsChecked="{Binding ObstructedByGeometry}"
+					IsEnabled="{Binding CanCastShadows}" />
+				<CheckBox
+					Grid.Row="2"
+					Content="{tombLib:Localize Shadow}"
+					IsChecked="{Binding CastsShadow}"
+					IsEnabled="{Binding CanCastDynamicShadows}" />
+
+				<CheckBox
+					Grid.Column="1"
+					Content="{tombLib:Localize Static}"
+					IsChecked="{Binding StaticallyUsed}"
+					IsEnabled="{Binding CanIlluminateGeometry}" />
+				<CheckBox
+					Grid.Row="1"
+					Grid.Column="1"
+					Content="{tombLib:Localize Dynamic}"
+					IsChecked="{Binding DynamicallyUsed}"
+					IsEnabled="{Binding CanIlluminateGeometry}" />
+				<CheckBox
+					Grid.Row="2"
+					Grid.Column="1"
+					Content="{tombLib:Localize Imported}"
+					IsChecked="{Binding UsedForImportedGeometry}"
+					IsEnabled="{Binding CanIlluminateGeometry}" />
+			</controls:SpacedGrid>
+		</controls:SpacedGrid>
+
+		<controls:SpacedGrid Grid.Column="1" RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition />
+			</Grid.RowDefinitions>
+
+			<Label
+				HorizontalAlignment="Right"
+				Content="{tombLib:Localize Color}"
+				Style="{DynamicResource ExtraHorizontalMarginLabel}" />
+			<controls:ColorPickerButton
+				Grid.Column="1"
+				Height="22"
+				Command="{Binding EditLightColorCommand}"
+				IsEnabled="{Binding HasLight}"
+				SelectedColor="{Binding LightColor, Mode=OneWay}" />
+			<Label
+				Grid.Row="1"
+				HorizontalAlignment="Right"
+				Content="{tombLib:Localize Intensity}"
+				Style="{DynamicResource ExtraHorizontalMarginLabel}" />
+			<controls:NumericUpDown
+				Grid.Row="1"
+				Grid.Column="1"
+				FormatString="F2"
+				Increment="0.01"
+				IsEnabled="{Binding HasLight}"
+				Value="{Binding Intensity}" />
+			<Label
+				Grid.Row="2"
+				HorizontalAlignment="Right"
+				Content="{tombLib:Localize InnerDistance}"
+				Style="{DynamicResource ExtraHorizontalMarginLabel}" />
+			<controls:NumericUpDown
+				Grid.Row="2"
+				Grid.Column="1"
+				FormatString="F2"
+				Increment="0.01"
+				IsEnabled="{Binding CanEditInRange}"
+				Value="{Binding InnerRange}" />
+			<Label
+				Grid.Row="3"
+				HorizontalAlignment="Right"
+				Content="{tombLib:Localize OuterDistance}"
+				Style="{DynamicResource ExtraHorizontalMarginLabel}" />
+			<controls:NumericUpDown
+				Grid.Row="3"
+				Grid.Column="1"
+				FormatString="F2"
+				Increment="0.01"
+				IsEnabled="{Binding CanEditOutRange}"
+				Value="{Binding OuterRange}" />
+
+			<Label
+				Grid.Column="2"
+				HorizontalAlignment="Right"
+				Content="{tombLib:Localize InnerAngle}"
+				Style="{DynamicResource ExtraHorizontalMarginLabel}">
+				<Label.Margin>
+					<Thickness Left="{x:Static darkUI:Defaults.SmallThicknessWidth}" />
+				</Label.Margin>
+			</Label>
+			<controls:NumericUpDown
+				Grid.Column="3"
+				FormatString="F2"
+				Increment="0.01"
+				IsEnabled="{Binding CanEditInOutAngle}"
+				Value="{Binding InnerAngle}" />
+			<Label
+				Grid.Row="1"
+				Grid.Column="2"
+				HorizontalAlignment="Right"
+				Content="{tombLib:Localize OuterAngle}"
+				Style="{DynamicResource ExtraHorizontalMarginLabel}">
+				<Label.Margin>
+					<Thickness Left="{x:Static darkUI:Defaults.SmallThicknessWidth}" />
+				</Label.Margin>
+			</Label>
+			<controls:NumericUpDown
+				Grid.Row="1"
+				Grid.Column="3"
+				FormatString="F2"
+				Increment="0.01"
+				IsEnabled="{Binding CanEditInOutAngle}"
+				Value="{Binding OuterAngle}" />
+			<Label
+				Grid.Row="2"
+				Grid.Column="2"
+				HorizontalAlignment="Right"
+				Content="{tombLib:Localize DirectionY}"
+				Style="{DynamicResource ExtraHorizontalMarginLabel}">
+				<Label.Margin>
+					<Thickness Left="{x:Static darkUI:Defaults.SmallThicknessWidth}" />
+				</Label.Margin>
+			</Label>
+			<controls:NumericUpDown
+				Grid.Row="2"
+				Grid.Column="3"
+				FormatString="F2"
+				Increment="0.01"
+				IsEnabled="{Binding CanEditDirection}"
+				Value="{Binding DirectionY}" />
+			<Label
+				Grid.Row="3"
+				Grid.Column="2"
+				HorizontalAlignment="Right"
+				Content="{tombLib:Localize DirectionX}"
+				Style="{DynamicResource ExtraHorizontalMarginLabel}">
+				<Label.Margin>
+					<Thickness Left="{x:Static darkUI:Defaults.SmallThicknessWidth}" />
+				</Label.Margin>
+			</Label>
+			<controls:NumericUpDown
+				Grid.Row="3"
+				Grid.Column="3"
+				FormatString="F2"
+				Increment="0.01"
+				IsEnabled="{Binding CanEditDirection}"
+				Value="{Binding DirectionX}" />
+		</controls:SpacedGrid>
+	</controls:SpacedGrid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/LightingPanel/LightingView.xaml.cs b/TombEditor/Features/DockableViews/LightingPanel/LightingView.xaml.cs
new file mode 100644
index 0000000000..69fdd6705e
--- /dev/null
+++ b/TombEditor/Features/DockableViews/LightingPanel/LightingView.xaml.cs
@@ -0,0 +1,20 @@
+using System.Windows.Controls;
+
+namespace TombEditor.Features.DockableViews.LightingPanel;
+
+public partial class LightingView : UserControl
+{
+	private readonly LightingViewModel _viewModel;
+
+	public LightingView()
+	{
+		InitializeComponent();
+		_viewModel = new LightingViewModel(Editor.Instance);
+		DataContext = _viewModel;
+	}
+
+	public void Cleanup()
+	{
+		_viewModel.Cleanup();
+	}
+}
diff --git a/TombEditor/Features/DockableViews/LightingPanel/LightingViewModel.cs b/TombEditor/Features/DockableViews/LightingPanel/LightingViewModel.cs
new file mode 100644
index 0000000000..f8123992ec
--- /dev/null
+++ b/TombEditor/Features/DockableViews/LightingPanel/LightingViewModel.cs
@@ -0,0 +1,284 @@
+#nullable enable
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Numerics;
+using System.Windows.Input;
+using System.Windows.Media;
+using TombLib.LevelData;
+using TombLib.WPF;
+
+namespace TombEditor.Features.DockableViews.LightingPanel;
+
+public partial class LightingViewModel : ObservableObject
+{
+	private readonly Editor _editor;
+
+	// Light type items matching LightType enum order: Point, Shadow, Spot, Effect, Sun, FogBulb.
+	public int SelectedLightType
+	{
+		get => (int)(_editor.SelectedObject is LightInstance light ? light.Type : (LightType)_lastSelectedLightType);
+		set
+		{
+			_lastSelectedLightType = value;
+			EditorActions.UpdateLightType((LightType)value);
+		}
+	}
+
+	public int SelectedLightQuality
+	{
+		get => (int)(_editor.SelectedObject is LightInstance light ? light.Quality : 0);
+		set => EditorActions.UpdateLightQuality((LightQuality)value);
+	}
+
+	public Color LightColor
+	{
+		get
+		{
+			if (_editor.SelectedObject is LightInstance light)
+				return new Vector4(light.Color * 0.5f, 1.0f).ToWPFColor();
+
+			return Colors.Transparent;
+		}
+	}
+
+	public decimal Intensity
+	{
+		get => (decimal)(_editor.SelectedObject is LightInstance light ? light.Intensity : 0);
+		set => UpdateLightFloat(
+			(l, v) => CompareRounded(l.Intensity, v, 2),
+			(l, v) => l.Intensity = v,
+			(float)value);
+	}
+
+	public decimal InnerRange
+	{
+		get => (decimal)(_editor.SelectedObject is LightInstance light && HasInRange(light) ? light.InnerRange : 0);
+		set => UpdateLightFloat(
+			(l, v) => CompareRounded(l.InnerRange, v, 2),
+			(l, v) => l.InnerRange = v,
+			(float)value);
+	}
+
+	public decimal OuterRange
+	{
+		get => (decimal)(_editor.SelectedObject is LightInstance light && HasOutRange(light) ? light.OuterRange : 0);
+		set => UpdateLightFloat(
+			(l, v) => CompareRounded(l.OuterRange, v, 2),
+			(l, v) => l.OuterRange = v,
+			(float)value);
+	}
+
+	public decimal InnerAngle
+	{
+		get => (decimal)(_editor.SelectedObject is LightInstance light && HasInOutAngle(light) ? light.InnerAngle : 0);
+		set => UpdateLightFloat(
+			(l, v) => CompareRounded(l.InnerAngle, v, 2),
+			(l, v) => l.InnerAngle = v,
+			(float)value);
+	}
+
+	public decimal OuterAngle
+	{
+		get => (decimal)(_editor.SelectedObject is LightInstance light && HasInOutAngle(light) ? light.OuterAngle : 0);
+		set => UpdateLightFloat(
+			(l, v) => CompareRounded(l.OuterAngle, v, 2),
+			(l, v) => l.OuterAngle = v,
+			(float)value);
+	}
+
+	public decimal DirectionY
+	{
+		get => (decimal)(_editor.SelectedObject is LightInstance light && HasDirection(light) ? light.RotationY : 0);
+		set => UpdateLightFloat(
+			(l, v) => CompareRounded(l.RotationY, v, 2),
+			(l, v) => l.RotationY = v,
+			(float)value);
+	}
+
+	public decimal DirectionX
+	{
+		get => (decimal)(_editor.SelectedObject is LightInstance light && HasDirection(light) ? light.RotationX : 0);
+		set => UpdateLightFloat(
+			(l, v) => CompareRounded(l.RotationX, v, 2),
+			(l, v) => l.RotationX = v,
+			(float)value);
+	}
+
+	public bool LightEnabled
+	{
+		get => _editor.SelectedObject is LightInstance light && light.Enabled;
+		set => UpdateLightBool(
+			(l, v) => l.Enabled == v,
+			(l, v) => l.Enabled = v,
+			value);
+	}
+
+	public bool ObstructedByGeometry
+	{
+		get => _editor.SelectedObject is LightInstance light && light.IsObstructedByRoomGeometry;
+		set => UpdateLightBool(
+			(l, v) => l.IsObstructedByRoomGeometry == v,
+			(l, v) => l.IsObstructedByRoomGeometry = v,
+			value);
+	}
+
+	public bool CastsShadow
+	{
+		get => _editor.SelectedObject is LightInstance light && light.CastDynamicShadows;
+		set => UpdateLightBool(
+			(l, v) => l.CastDynamicShadows == v,
+			(l, v) => l.CastDynamicShadows = v,
+			value);
+	}
+
+	public bool StaticallyUsed
+	{
+		get => _editor.SelectedObject is LightInstance light && light.IsStaticallyUsed;
+		set => UpdateLightBool(
+			(l, v) => l.IsStaticallyUsed == v,
+			(l, v) => l.IsStaticallyUsed = v,
+			value);
+	}
+
+	public bool DynamicallyUsed
+	{
+		get => _editor.SelectedObject is LightInstance light && light.IsDynamicallyUsed;
+		set => UpdateLightBool(
+			(l, v) => l.IsDynamicallyUsed == v,
+			(l, v) => l.IsDynamicallyUsed = v,
+			value);
+	}
+
+	public bool UsedForImportedGeometry
+	{
+		get => _editor.SelectedObject is LightInstance light && light.IsUsedForImportedGeometry;
+		set => UpdateLightBool(
+			(l, v) => l.IsUsedForImportedGeometry == v,
+			(l, v) => l.IsUsedForImportedGeometry = v,
+			value);
+	}
+
+	// Enabled state for controls.
+	[ObservableProperty] private bool _hasLight;
+
+	[ObservableProperty] private bool _canEditInRange;
+	[ObservableProperty] private bool _canEditOutRange;
+	[ObservableProperty] private bool _canEditInOutAngle;
+	[ObservableProperty] private bool _canEditDirection;
+	[ObservableProperty] private bool _canCastShadows;
+	[ObservableProperty] private bool _canCastDynamicShadows;
+	[ObservableProperty] private bool _canIlluminateGeometry;
+	[ObservableProperty] private bool _canEditQuality;
+
+	public ICommand AddLightCommand { get; }
+
+	private int _lastSelectedLightType;
+
+	public LightingViewModel(Editor editor)
+	{
+		_editor = editor;
+		_editor.EditorEventRaised += EditorEventRaised;
+
+		AddLightCommand = new RelayCommand(PlaceSelectedLightType);
+
+		RefreshLightState();
+	}
+
+	public void Cleanup()
+	{
+		_editor.EditorEventRaised -= EditorEventRaised;
+	}
+
+	[RelayCommand]
+	private void EditLightColor()
+	{
+		EditorActions.EditLightColor(WPFUtils.GetWin32WindowFromCaller(this));
+	}
+
+	private void EditorEventRaised(IEditorEvent obj)
+	{
+		if (obj is Editor.InitEvent or
+			Editor.GameVersionChangedEvent or
+			Editor.LevelChangedEvent or
+			Editor.ObjectChangedEvent or
+			Editor.SelectedObjectChangedEvent)
+			RefreshLightState();
+	}
+
+	private void RefreshLightState()
+	{
+		var isTEN = _editor.Level.Settings.GameVersion == TRVersion.Game.TombEngine;
+		var light = _editor.SelectedObject as LightInstance;
+
+		HasLight = light != null;
+		CanEditInRange = light != null && HasInRange(light);
+		CanEditOutRange = light != null && HasOutRange(light);
+		CanEditInOutAngle = light != null && HasInOutAngle(light);
+		CanEditDirection = light != null && HasDirection(light);
+		CanCastShadows = light != null && CanObstruct(light);
+		CanCastDynamicShadows = light != null && CanDynamicShadow(light, isTEN);
+		CanIlluminateGeometry = light != null && CanIlluminate(light);
+		CanEditQuality = light != null;
+
+		OnPropertyChanged(nameof(SelectedLightType));
+		OnPropertyChanged(nameof(SelectedLightQuality));
+		OnPropertyChanged(nameof(LightColor));
+		OnPropertyChanged(nameof(Intensity));
+		OnPropertyChanged(nameof(InnerRange));
+		OnPropertyChanged(nameof(OuterRange));
+		OnPropertyChanged(nameof(InnerAngle));
+		OnPropertyChanged(nameof(OuterAngle));
+		OnPropertyChanged(nameof(DirectionY));
+		OnPropertyChanged(nameof(DirectionX));
+		OnPropertyChanged(nameof(LightEnabled));
+		OnPropertyChanged(nameof(ObstructedByGeometry));
+		OnPropertyChanged(nameof(CastsShadow));
+		OnPropertyChanged(nameof(StaticallyUsed));
+		OnPropertyChanged(nameof(DynamicallyUsed));
+		OnPropertyChanged(nameof(UsedForImportedGeometry));
+	}
+
+	private void PlaceSelectedLightType()
+	{
+		EditorActions.PlaceLight((LightType)_lastSelectedLightType);
+	}
+
+	private void UpdateLightFloat(Func<LightInstance, float, bool> compare, Action<LightInstance, float> setter, float value)
+	{
+		EditorActions.UpdateLight(compare, setter, light => (float?)value);
+	}
+
+	private void UpdateLightBool(Func<LightInstance, bool, bool> compare, Action<LightInstance, bool> setter, bool value)
+	{
+		EditorActions.UpdateLight(compare, setter, light => (bool?)value);
+	}
+
+	private static bool CompareRounded(float first, float second, int decimalPlaces)
+	{
+		float multiplier = (float)Math.Pow(10, decimalPlaces);
+		return Math.Round(first * multiplier) == Math.Round(second * multiplier);
+	}
+
+	private static bool HasInRange(LightInstance light)
+		=> light.Type is LightType.Point or LightType.Shadow or LightType.Effect or LightType.Spot;
+
+	private static bool HasOutRange(LightInstance light)
+		=> light.Type is LightType.Point or LightType.Shadow or LightType.Effect or LightType.FogBulb or LightType.Spot;
+
+	private static bool HasInOutAngle(LightInstance light)
+		=> light.Type is LightType.Spot;
+
+	private static bool HasDirection(LightInstance light)
+		=> light.Type is LightType.Spot or LightType.Sun;
+
+	private static bool CanObstruct(LightInstance light)
+		=> light.Type is LightType.Point or LightType.Shadow or LightType.Spot or LightType.Sun;
+
+	private static bool CanDynamicShadow(LightInstance light, bool isTEN)
+		=> isTEN && light.Type is LightType.Point or LightType.Spot;
+
+	private static bool CanIlluminate(LightInstance light)
+		=> light.Type is LightType.Point or LightType.Shadow or LightType.Spot or LightType.Sun;
+}
diff --git a/TombEditor/ToolWindows/ObjectList.Designer.cs b/TombEditor/Features/DockableViews/ObjectList/ObjectList.Designer.cs
similarity index 98%
rename from TombEditor/ToolWindows/ObjectList.Designer.cs
rename to TombEditor/Features/DockableViews/ObjectList/ObjectList.Designer.cs
index 3082474393..fbe74eee3a 100644
--- a/TombEditor/ToolWindows/ObjectList.Designer.cs
+++ b/TombEditor/Features/DockableViews/ObjectList/ObjectList.Designer.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.ObjectList
 {
     partial class ObjectList
     {
@@ -106,6 +106,7 @@ private void InitializeComponent()
         }
 
         #endregion
+
         private System.Windows.Forms.Panel panelTriggerTools;
         private System.Windows.Forms.Panel panelTriggerList;
         private System.Windows.Forms.ToolTip toolTip;
diff --git a/TombEditor/ToolWindows/ObjectList.cs b/TombEditor/Features/DockableViews/ObjectList/ObjectList.cs
similarity index 99%
rename from TombEditor/ToolWindows/ObjectList.cs
rename to TombEditor/Features/DockableViews/ObjectList/ObjectList.cs
index f722db33d2..78cd7ad958 100644
--- a/TombEditor/ToolWindows/ObjectList.cs
+++ b/TombEditor/Features/DockableViews/ObjectList/ObjectList.cs
@@ -6,7 +6,7 @@
 using System.Windows.Forms;
 using TombLib.LevelData;
 
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.ObjectList
 {
     public partial class ObjectList : DarkToolWindow
     {
diff --git a/TombEditor/ToolWindows/ObjectList.resx b/TombEditor/Features/DockableViews/ObjectList/ObjectList.resx
similarity index 100%
rename from TombEditor/ToolWindows/ObjectList.resx
rename to TombEditor/Features/DockableViews/ObjectList/ObjectList.resx
diff --git a/TombEditor/Features/DockableViews/ObjectList/ObjectListView.xaml b/TombEditor/Features/DockableViews/ObjectList/ObjectListView.xaml
new file mode 100644
index 0000000000..3a2fdf0970
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ObjectList/ObjectListView.xaml
@@ -0,0 +1,35 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.ObjectList.ObjectListView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	d:DesignHeight="175"
+	d:DesignWidth="285"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<controls:SpacedGrid Margin="{x:Static darkUI:Defaults.SmallThickness}" RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+		<Grid.RowDefinitions>
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<WindowsFormsHost x:Name="TreeViewHost" />
+
+		<controls:SpacedStack
+			Grid.Row="1"
+			Orientation="Horizontal"
+			Spacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Button Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_edit-16.png" />
+			</Button>
+			<Button Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_trash-16.png" />
+			</Button>
+		</controls:SpacedStack>
+	</controls:SpacedGrid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/ObjectList/ObjectListView.xaml.cs b/TombEditor/Features/DockableViews/ObjectList/ObjectListView.xaml.cs
new file mode 100644
index 0000000000..ef23d5c2aa
--- /dev/null
+++ b/TombEditor/Features/DockableViews/ObjectList/ObjectListView.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace TombEditor.Features.DockableViews.ObjectList;
+
+public partial class ObjectListView : UserControl
+{
+	public ObjectListView()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/TombEditor/Features/DockableViews/PalettePanel/Palette.Designer.cs b/TombEditor/Features/DockableViews/PalettePanel/Palette.Designer.cs
new file mode 100644
index 0000000000..c7191f42e6
--- /dev/null
+++ b/TombEditor/Features/DockableViews/PalettePanel/Palette.Designer.cs
@@ -0,0 +1,40 @@
+namespace TombEditor.Features.DockableViews.PalettePanel
+{
+    partial class Palette
+    {
+        private System.ComponentModel.IContainer components = null;
+
+        #region Component Designer generated code
+
+        private void InitializeComponent()
+        {
+            _elementHost = new System.Windows.Forms.Integration.ElementHost();
+            _paletteView = new PaletteView();
+            SuspendLayout();
+            // 
+            // _elementHost
+            // 
+            _elementHost.Dock = System.Windows.Forms.DockStyle.Fill;
+            _elementHost.Name = "_elementHost";
+            _elementHost.Child = _paletteView;
+            // 
+            // Palette
+            // 
+            AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            Controls.Add(_elementHost);
+            DefaultDockArea = DarkUI.Docking.DarkDockArea.Bottom;
+            DockText = "Palette";
+            MinimumSize = new System.Drawing.Size(100, 100);
+            Name = "Palette";
+            SerializationKey = "Palette";
+            Size = new System.Drawing.Size(645, 141);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Integration.ElementHost _elementHost;
+        private PaletteView _paletteView;
+    }
+}
diff --git a/TombEditor/Features/DockableViews/PalettePanel/Palette.cs b/TombEditor/Features/DockableViews/PalettePanel/Palette.cs
new file mode 100644
index 0000000000..7cd0eb39f2
--- /dev/null
+++ b/TombEditor/Features/DockableViews/PalettePanel/Palette.cs
@@ -0,0 +1,22 @@
+using DarkUI.Docking;
+
+namespace TombEditor.Features.DockableViews.PalettePanel;
+
+public partial class Palette : DarkToolWindow
+{
+	public Palette()
+	{
+		InitializeComponent();
+	}
+
+	protected override void Dispose(bool disposing)
+	{
+		if (disposing)
+		{
+			_paletteView?.Cleanup();
+			components?.Dispose();
+		}
+
+		base.Dispose(disposing);
+	}
+}
diff --git a/TombEditor/ToolWindows/Palette.resx b/TombEditor/Features/DockableViews/PalettePanel/Palette.resx
similarity index 100%
rename from TombEditor/ToolWindows/Palette.resx
rename to TombEditor/Features/DockableViews/PalettePanel/Palette.resx
diff --git a/TombEditor/Features/DockableViews/PalettePanel/PaletteGrid.cs b/TombEditor/Features/DockableViews/PalettePanel/PaletteGrid.cs
new file mode 100644
index 0000000000..9a9cb50657
--- /dev/null
+++ b/TombEditor/Features/DockableViews/PalettePanel/PaletteGrid.cs
@@ -0,0 +1,357 @@
+#nullable enable
+
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+using TombLib.LevelData;
+using TombLib.Utils;
+using TombLib.WPF;
+
+namespace TombEditor.Features.DockableViews.PalettePanel;
+
+public class PaletteGrid : FrameworkElement
+{
+	private static readonly Logger logger = LogManager.GetCurrentClassLogger();
+
+	private const double CellWidth = 10.0;
+	private const double CellHeight = 10.0;
+
+	private static readonly Pen GridPen = WPFUtils.CreateFrozenPen(Color.FromArgb(140, 0, 0, 0), 1.0);
+	private static readonly Pen BorderPen = WPFUtils.CreateFrozenPen(Colors.Black, 1.0);
+	private static readonly Pen SelectionPen = WPFUtils.CreateFrozenPen(Colors.White, 1.0);
+
+	private readonly Editor _editor = null!;
+	private List<ColorC> _palette = [];
+	private int _selectedIndex = -1;
+	private Size _oldPaletteSize;
+
+	public bool Editable { get; set; } = true;
+
+	public Color SelectedColor => GetColorAtIndex(_selectedIndex);
+
+	public ColorC SelectedColorC
+		=> _selectedIndex >= 0 && _selectedIndex < _palette.Count
+			? _palette[_selectedIndex]
+			: new ColorC(128, 128, 128);
+
+	public List<ColorC> Palette => [.. _palette];
+
+	private int ColumnCount => (int)(ActualWidth / CellWidth);
+	private int RowCount => (int)(ActualHeight / CellHeight);
+
+	public PaletteGrid()
+	{
+		ClipToBounds = true;
+		Focusable = true;
+		SnapsToDevicePixels = true;
+		UseLayoutRounding = true;
+		RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
+
+		if (DesignerProperties.GetIsInDesignMode(this))
+			return;
+
+		_editor = Editor.Instance;
+	}
+
+	public void LoadPalette(List<ColorC> palette)
+	{
+		if (palette.Count < 1)
+			return;
+
+		_palette = [.. palette.Select(c => new ColorC(c.R, c.G, c.B))];
+		PickColor();
+		InvalidateVisual();
+	}
+
+	public void PickColor()
+	{
+		if (!_editor.Configuration.Palette_PickColorFromSelectedObject || _editor.SelectedObject == null)
+			return;
+
+		if (_editor.SelectedObject is not IColorable instance)
+			return;
+
+		var normalizedColor = instance.Color / 2.0f;
+		var color = new ColorC(
+			(byte)(normalizedColor.X * 255),
+			(byte)(normalizedColor.Y * 255),
+			(byte)(normalizedColor.Z * 255));
+
+		for (int i = 0; i < _palette.Count; i++)
+		{
+			if (_palette[i] == color)
+			{
+				_selectedIndex = i;
+				_editor.LastUsedPaletteColourChange(SelectedColorC);
+				InvalidateVisual();
+				return;
+			}
+		}
+	}
+
+	public void SetColorAtSelection(ColorC color)
+	{
+		if (_selectedIndex < 0)
+			return;
+
+		if (_selectedIndex >= _palette.Count)
+			_palette.Add(color);
+		else
+			_palette[_selectedIndex] = color;
+
+		InvalidateVisual();
+	}
+
+	// Mouse interaction.
+
+	protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+	{
+		base.OnMouseLeftButtonDown(e);
+		Focus();
+
+		if (e.ClickCount == 2 && Editable)
+		{
+			PickColourFromDialog();
+			return;
+		}
+
+		CaptureMouse();
+
+		if (Keyboard.Modifiers.HasFlag(ModifierKeys.Alt))
+		{
+			PickColourFromDialog(false);
+			return;
+		}
+
+		if (_editor.SelectedObject is IColorable)
+		{
+			_editor.UndoManager.PushObjectPropertyChanged(
+				(PositionBasedObjectInstance)_editor.SelectedObject);
+		}
+
+		_editor.ToggleHiddenSelection(true);
+		ChangeColorByMouse(e.GetPosition(this));
+	}
+
+	protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+	{
+		base.OnMouseLeftButtonUp(e);
+		_editor.ToggleHiddenSelection(false);
+		ReleaseMouseCapture();
+	}
+
+	protected override void OnMouseMove(MouseEventArgs e)
+	{
+		base.OnMouseMove(e);
+
+		if (e.LeftButton == MouseButtonState.Pressed)
+			ChangeColorByMouse(e.GetPosition(this));
+	}
+
+	private void ChangeColorByMouse(Point position)
+	{
+		int columns = ColumnCount;
+		int rows = RowCount;
+
+		if (columns <= 0 || rows <= 0)
+			return;
+
+		int x = position.X < 0 ? 0 : (int)(position.X / CellWidth);
+		int y = position.Y < 0 ? 0 : (int)(position.Y / CellHeight);
+
+		x = Math.Min(x, columns - 1);
+		y = Math.Min(y, rows - 1);
+
+		_selectedIndex = (y * columns) + x;
+
+		if (_editor.SelectedObject != null && _editor.SelectedObject.CanBeColored())
+		{
+			_editor.ToggleHiddenSelection(true);
+
+			if (_editor.SelectedObject is IColorable instance)
+			{
+				instance.Color = SelectedColor.ToFloat3Color() * 2.0f;
+
+				if (_editor.SelectedObject is LightInstance)
+					_editor.SelectedObject.Room.RebuildLighting(_editor.Configuration.Rendering3D_HighQualityLightPreview);
+
+				_editor.ObjectChange(_editor.SelectedObject, ObjectChangeType.Change);
+			}
+		}
+
+		_editor.LastUsedPaletteColourChange(SelectedColorC);
+		InvalidateVisual();
+	}
+
+	private void PickColourFromDialog(bool onlyFromPalette = true)
+	{
+		using var colorDialog = new TombLib.Controls.RealtimeColorDialog(
+			_editor.Configuration.ColorDialog_Position.X,
+			_editor.Configuration.ColorDialog_Position.Y,
+			null,
+			_editor.Configuration.UI_ColorScheme);
+
+		var currentColor = SelectedColor;
+		colorDialog.Color = System.Drawing.Color.FromArgb(currentColor.A, currentColor.R, currentColor.G, currentColor.B);
+
+		if (!onlyFromPalette)
+		{
+			var obj = _editor.SelectedObject;
+
+			if (obj is LightInstance light)
+				colorDialog.Color = (light.Color * 0.5f).ToWinFormsColor();
+			else if (obj is StaticInstance stat)
+				colorDialog.Color = (stat.Color * 0.5f).ToWinFormsColor();
+			else if (_editor.Level.IsTombEngine && obj is MoveableInstance moveable)
+				colorDialog.Color = moveable.Color.ToWinFormsColor();
+		}
+
+		if (colorDialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+		{
+			var picked = colorDialog.Color;
+			SetColorAtSelection(new ColorC(picked.R, picked.G, picked.B));
+			_editor.Level.Settings.Palette = Palette;
+		}
+
+		_editor.Configuration.ColorDialog_Position = colorDialog.Position;
+	}
+
+	// Rendering.
+
+	protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+	{
+		base.OnRenderSizeChanged(sizeInfo);
+
+		// Recalculate selected color coordinate on resize.
+		if (_selectedIndex >= 0)
+		{
+			int oldColumns = _oldPaletteSize.Width > 0 ? (int)(_oldPaletteSize.Width / CellWidth) : ColumnCount;
+			int newColumns = ColumnCount;
+
+			if (oldColumns > 0 && newColumns > 0 && oldColumns != newColumns)
+			{
+				int x = _selectedIndex % oldColumns;
+				int y = _selectedIndex / oldColumns;
+				_selectedIndex = (y * oldColumns) + x;
+			}
+		}
+
+		_oldPaletteSize = sizeInfo.NewSize;
+		InvalidateVisual();
+	}
+
+	protected override void OnRender(DrawingContext dc)
+	{
+		if (_editor == null)
+		{
+			DrawDesignPlaceholder(dc);
+			return;
+		}
+
+		try
+		{
+			int columns = ColumnCount;
+			int rows = RowCount;
+
+			if (columns <= 0 || rows <= 0)
+				return;
+
+			DrawCells(dc, columns, rows);
+			DrawGridLines(dc, columns, rows);
+			DrawOuterBorder(dc, columns, rows);
+			DrawSelectionRect(dc, columns, rows);
+		}
+		catch (Exception ex)
+		{
+			logger.Error(ex, "An exception occured while drawing the palette grid.");
+		}
+	}
+
+	private void DrawCells(DrawingContext dc, int columns, int rows)
+	{
+		for (int y = 0; y < rows; y++)
+		{
+			for (int x = 0; x < columns; x++)
+			{
+				int index = (y * columns) + x;
+				var color = GetColorAtIndex(index);
+				var brush = WPFUtils.CreateFrozenBrush(color);
+				dc.DrawRectangle(brush, null, new Rect(x * CellWidth, y * CellHeight, CellWidth, CellHeight));
+			}
+		}
+	}
+
+	private static void DrawGridLines(DrawingContext dc, int columns, int rows)
+	{
+		double totalWidth = columns * CellWidth;
+		double totalHeight = rows * CellHeight;
+
+		for (int x = 1; x < columns; x++)
+		{
+			double xPos = x * CellWidth;
+			dc.DrawLine(GridPen, new Point(xPos, 0), new Point(xPos, totalHeight));
+		}
+
+		for (int y = 1; y < rows; y++)
+		{
+			double yPos = y * CellHeight;
+			dc.DrawLine(GridPen, new Point(0, yPos), new Point(totalWidth, yPos));
+		}
+	}
+
+	private static void DrawOuterBorder(DrawingContext dc, int columns, int rows)
+	{
+		double totalWidth = columns * CellWidth;
+		double totalHeight = rows * CellHeight;
+
+		// Inset by half the pen thickness so the stroke doesn't get clipped by bounds.
+		const double half = 0.5;
+		dc.DrawRectangle(null, BorderPen, new Rect(half, half, totalWidth - 1.0, totalHeight - 1.0));
+	}
+
+	private void DrawSelectionRect(DrawingContext dc, int columns, int rows)
+	{
+		if (_selectedIndex < 0 || columns <= 0)
+			return;
+
+		int x = _selectedIndex % columns;
+		int y = _selectedIndex / columns;
+
+		if (y >= rows)
+			return;
+
+		dc.DrawRectangle(null, SelectionPen, new Rect(x * CellWidth, y * CellHeight, CellWidth, CellHeight));
+	}
+
+	private Color GetColorAtIndex(int index)
+	{
+		if (index < 0 || index >= _palette.Count)
+			return Colors.Transparent;
+
+		var c = _palette[index];
+		return Color.FromRgb(c.R, c.G, c.B);
+	}
+
+	// Helper methods.
+
+	private void DrawDesignPlaceholder(DrawingContext dc)
+	{
+		dc.DrawRectangle(WPFUtils.CreateFrozenBrush(Color.FromRgb(50, 50, 50)), BorderPen,
+			new Rect(0, 0, ActualWidth, ActualHeight));
+
+		var text = new FormattedText("Palette",
+			System.Globalization.CultureInfo.InvariantCulture,
+			FlowDirection.LeftToRight,
+			new Typeface("Segoe UI"), 12.0, Brushes.Gray,
+			VisualTreeHelper.GetDpi(this).PixelsPerDip);
+
+		dc.DrawText(text, new Point(
+			(ActualWidth - text.Width) / 2.0,
+			(ActualHeight - text.Height) / 2.0));
+	}
+}
diff --git a/TombEditor/Features/DockableViews/PalettePanel/PaletteView.xaml b/TombEditor/Features/DockableViews/PalettePanel/PaletteView.xaml
new file mode 100644
index 0000000000..1b7fd353e6
--- /dev/null
+++ b/TombEditor/Features/DockableViews/PalettePanel/PaletteView.xaml
@@ -0,0 +1,55 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.PalettePanel.PaletteView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:local="clr-namespace:TombEditor.Features.DockableViews.PalettePanel"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	d:DesignHeight="120"
+	d:DesignWidth="645"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<controls:SpacedGrid Margin="{x:Static darkUI:Defaults.SmallThickness}" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+		<Grid.LayoutTransform>
+			<ScaleTransform x:Name="Scaler" ScaleX="1" ScaleY="1" />
+		</Grid.LayoutTransform>
+
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition />
+		</Grid.ColumnDefinitions>
+
+		<controls:SpacedStack Spacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Button
+				x:Name="butResetToDefaults"
+				Command="{Binding ResetPaletteCommand}"
+				IsEnabled="{Binding CanResetPalette}"
+				Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_actions/actions_refresh-16.png" />
+			</Button>
+			<ToggleButton
+				x:Name="butSampleFromTextures"
+				Command="{Binding SampleFromTexturesCommand}"
+				IsChecked="{Binding IsTextureSamplingMode, Mode=OneWay}"
+				Style="{DynamicResource ToggleButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_actions/actions_TextureMode-16.png" />
+			</ToggleButton>
+			<Button
+				x:Name="butEditColor"
+				Command="{Binding EditObjectColorCommand}"
+				IsEnabled="{Binding CanEditColor}"
+				Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_edit-16.png" />
+			</Button>
+		</controls:SpacedStack>
+
+		<local:PaletteGrid
+			x:Name="PaletteGridControl"
+			Grid.Column="1"
+			LayoutTransform="{Binding LayoutTransform.Inverse, RelativeSource={RelativeSource AncestorType={x:Type Grid}}}" />
+	</controls:SpacedGrid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/PalettePanel/PaletteView.xaml.cs b/TombEditor/Features/DockableViews/PalettePanel/PaletteView.xaml.cs
new file mode 100644
index 0000000000..63dbce4ae5
--- /dev/null
+++ b/TombEditor/Features/DockableViews/PalettePanel/PaletteView.xaml.cs
@@ -0,0 +1,90 @@
+#nullable enable
+
+using System.Collections.Generic;
+using System.Windows.Controls;
+using TombLib.LevelData;
+using TombLib.Utils;
+
+namespace TombEditor.Features.DockableViews.PalettePanel;
+
+public partial class PaletteView : UserControl
+{
+	private readonly Editor _editor;
+	private readonly PaletteViewModel _viewModel;
+	private List<ColorC>? _lastTexturePalette;
+
+	public PaletteView()
+	{
+		InitializeComponent();
+
+		_editor = Editor.Instance;
+		_viewModel = new PaletteViewModel(_editor);
+		DataContext = _viewModel;
+
+		_editor.EditorEventRaised += EditorEventRaised;
+
+		PaletteGridControl.LoadPalette(LevelSettings.LoadPalette());
+		UpdatePalette(false);
+	}
+
+	public void Cleanup()
+	{
+		_editor.EditorEventRaised -= EditorEventRaised;
+		_viewModel.Cleanup();
+	}
+
+	private void EditorEventRaised(IEditorEvent obj)
+	{
+		if (obj is Editor.LevelChangedEvent levelChanged)
+		{
+			_lastTexturePalette = null;
+			PaletteGridControl.LoadPalette(levelChanged.Current.Settings.Palette);
+		}
+
+		if (obj is Editor.SelectedObjectChangedEvent)
+			PaletteGridControl.PickColor();
+
+		if (obj is Editor.ObjectChangedEvent objectChanged)
+		{
+			if (objectChanged.ChangeType == ObjectChangeType.Change &&
+				objectChanged.Object == _editor.SelectedObject &&
+				objectChanged.Object is IColorable)
+				PaletteGridControl.PickColor();
+		}
+
+		if (obj is Editor.ResetPaletteEvent)
+		{
+			if (!_editor.Configuration.Palette_TextureSamplingMode)
+			{
+				PaletteGridControl.LoadPalette(LevelSettings.LoadPalette());
+				_editor.Level.Settings.Palette = PaletteGridControl.Palette;
+			}
+		}
+
+		if (obj is Editor.SelectedLevelTextureChangedSetEvent textureChanged)
+		{
+			_lastTexturePalette = [.. textureChanged.Texture.Image.Palette];
+			UpdatePalette();
+		}
+
+		if (obj is Editor.ConfigurationChangedEvent)
+			UpdatePalette();
+	}
+
+	private void UpdatePalette(bool reloadPalette = true)
+	{
+		PaletteGridControl.Editable = !_editor.Configuration.Palette_TextureSamplingMode;
+
+		if (reloadPalette)
+		{
+			bool useTexture = _editor.Configuration.Palette_TextureSamplingMode;
+
+			if (useTexture && _lastTexturePalette != null && _lastTexturePalette.Count > 0)
+				PaletteGridControl.LoadPalette(_lastTexturePalette);
+			else
+				PaletteGridControl.LoadPalette(_editor.Level.Settings.Palette);
+
+			_editor.LastUsedPaletteColourChange(PaletteGridControl.SelectedColorC);
+		}
+	}
+}
diff --git a/TombEditor/Features/DockableViews/PalettePanel/PaletteViewModel.cs b/TombEditor/Features/DockableViews/PalettePanel/PaletteViewModel.cs
new file mode 100644
index 0000000000..bbbdf6e45f
--- /dev/null
+++ b/TombEditor/Features/DockableViews/PalettePanel/PaletteViewModel.cs
@@ -0,0 +1,70 @@
+#nullable enable
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using System.Collections.Generic;
+using System.Windows.Input;
+using TombLib.LevelData;
+using TombLib.Utils;
+using TombLib.WPF;
+
+namespace TombEditor.Features.DockableViews.PalettePanel;
+
+public partial class PaletteViewModel : ObservableObject
+{
+	private readonly Editor _editor;
+
+	[ObservableProperty] private bool _isTextureSamplingMode;
+	[ObservableProperty] private bool _canResetPalette;
+	[ObservableProperty] private bool _canEditPalette;
+	[ObservableProperty] private bool _canEditColor;
+
+	public ICommand ResetPaletteCommand { get; }
+	public ICommand SampleFromTexturesCommand { get; }
+	public ICommand EditObjectColorCommand { get; }
+
+	private List<ColorC>? _lastTexturePalette;
+
+	public PaletteViewModel(Editor editor)
+	{
+		_editor = editor;
+		_editor.EditorEventRaised += EditorEventRaised;
+
+		var args = new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor);
+		ResetPaletteCommand = CommandHandler.GetCommand("ResetPalette", args);
+		SampleFromTexturesCommand = CommandHandler.GetCommand("SamplePaletteFromTextures", args);
+		EditObjectColorCommand = CommandHandler.GetCommand("EditObjectColor", args);
+
+		UpdateControlState();
+	}
+
+	public void Cleanup()
+	{
+		_editor.EditorEventRaised -= EditorEventRaised;
+	}
+
+	private void EditorEventRaised(IEditorEvent obj)
+	{
+		if (obj is Editor.SelectedObjectChangedEvent selectedObjChanged)
+			CanEditColor = selectedObjChanged.Current.CanBeColored();
+
+		if (obj is Editor.SelectedLevelTextureChangedSetEvent textureChanged)
+		{
+			_lastTexturePalette = [.. textureChanged.Texture.Image.Palette];
+			UpdateControlState();
+		}
+
+		if (obj is Editor.ConfigurationChangedEvent)
+			UpdateControlState();
+	}
+
+	public List<ColorC>? GetLastTexturePalette() => _lastTexturePalette;
+
+	private void UpdateControlState()
+	{
+		bool useTexture = _editor.Configuration.Palette_TextureSamplingMode;
+
+		IsTextureSamplingMode = useTexture;
+		CanResetPalette = !useTexture;
+		CanEditPalette = !useTexture;
+	}
+}
diff --git a/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptions.Designer.cs b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptions.Designer.cs
new file mode 100644
index 0000000000..95cced606b
--- /dev/null
+++ b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptions.Designer.cs
@@ -0,0 +1,39 @@
+namespace TombEditor.Features.DockableViews.RoomOptionsPanel
+{
+    partial class RoomOptions
+    {
+        private System.ComponentModel.IContainer components = null;
+
+        #region Component Designer generated code
+
+        private void InitializeComponent()
+        {
+            _elementHost = new System.Windows.Forms.Integration.ElementHost();
+            _roomOptionsView = new RoomOptionsView();
+            SuspendLayout();
+            // 
+            // _elementHost
+            // 
+            _elementHost.Dock = System.Windows.Forms.DockStyle.Fill;
+            _elementHost.Name = "_elementHost";
+            _elementHost.Child = _roomOptionsView;
+            // 
+            // RoomOptions
+            // 
+            AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            Controls.Add(_elementHost);
+            DockText = "Room Options";
+            MinimumSize = new System.Drawing.Size(284, 236);
+            Name = "RoomOptions";
+            SerializationKey = "RoomOptions";
+            Size = new System.Drawing.Size(284, 236);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Integration.ElementHost _elementHost;
+        private RoomOptionsView _roomOptionsView;
+    }
+}
diff --git a/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptions.cs b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptions.cs
new file mode 100644
index 0000000000..6f2a1c96d4
--- /dev/null
+++ b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptions.cs
@@ -0,0 +1,22 @@
+using DarkUI.Docking;
+
+namespace TombEditor.Features.DockableViews.RoomOptionsPanel;
+
+public partial class RoomOptions : DarkToolWindow
+{
+	public RoomOptions()
+	{
+		InitializeComponent();
+	}
+
+	protected override void Dispose(bool disposing)
+	{
+		if (disposing)
+		{
+			_roomOptionsView?.Cleanup();
+			components?.Dispose();
+		}
+
+		base.Dispose(disposing);
+	}
+}
diff --git a/TombEditor/ToolWindows/RoomOptions.resx b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptions.resx
similarity index 100%
rename from TombEditor/ToolWindows/RoomOptions.resx
rename to TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptions.resx
diff --git a/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsView.xaml b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsView.xaml
new file mode 100644
index 0000000000..b6d67d318d
--- /dev/null
+++ b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsView.xaml
@@ -0,0 +1,302 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.RoomOptionsPanel.RoomOptionsView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
+	MinWidth="285"
+	MinHeight="215"
+	d:DesignHeight="215"
+	d:DesignWidth="295"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<Grid Margin="{x:Static darkUI:Defaults.SmallThickness}">
+		<Grid.RowDefinitions>
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<controls:SpacedGrid ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+
+			<controls:SpacedGrid RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+
+				<controls:SearchableComboBox
+					FilterIgnoredString="{tombLib:Localize EmptyRoom}"
+					IsSynchronizedWithCurrentItem="True"
+					ItemsSource="{Binding Rooms}"
+					SelectedIndex="{Binding SelectedRoom}"
+					VirtualizingPanel.IsVirtualizing="True"
+					VirtualizingPanel.VirtualizationMode="Recycling">
+					<ComboBox.ItemsPanel>
+						<ItemsPanelTemplate>
+							<VirtualizingStackPanel />
+						</ItemsPanelTemplate>
+					</ComboBox.ItemsPanel>
+				</controls:SearchableComboBox>
+
+				<controls:SpacedGrid Grid.Row="1" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition />
+					</Grid.ColumnDefinitions>
+
+					<Label VerticalAlignment="Center" Content="{tombLib:Localize Tags}" />
+					<controls:AutoCompleteBox
+						Grid.Column="1"
+						ItemsSource="{Binding TagsAutoCompleteData}"
+						Text="{Binding Tags}" />
+				</controls:SpacedGrid>
+
+				<controls:SpacedGrid Grid.Row="2" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition Width="58" />
+						<ColumnDefinition />
+					</Grid.ColumnDefinitions>
+
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+
+					<Label Content="{tombLib:Localize RoomType}" />
+					<ComboBox
+						Grid.Row="1"
+						ItemsSource="{Binding RoomTypes}"
+						SelectedIndex="{Binding SelectedRoomType}" />
+
+					<Label Grid.Column="1" Content="{tombLib:Localize Flipmap}" />
+					<ComboBox
+						Grid.Row="1"
+						Grid.Column="1"
+						ItemsSource="{Binding FlipMaps}"
+						SelectedIndex="{Binding SelectedFlipMap}" />
+
+					<Label Grid.Column="2" Content="{tombLib:Localize Reverb}" />
+					<ComboBox
+						Grid.Row="1"
+						Grid.Column="2"
+						IsEnabled="{Binding SupportsReverb}"
+						ItemsSource="{Binding ReverbValues}"
+						SelectedIndex="{Binding SelectedReverb}" />
+				</controls:SpacedGrid>
+
+				<controls:SpacedGrid
+					Grid.Row="3"
+					ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}"
+					RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+					<Grid.Margin>
+						<Thickness Top="{x:Static darkUI:Defaults.SmallThicknessWidth}" />
+					</Grid.Margin>
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition />
+						<ColumnDefinition />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+						<RowDefinition Height="Auto" />
+					</Grid.RowDefinitions>
+
+					<CheckBox
+						Content="{tombLib:Localize Skybox}"
+						IsChecked="{Binding Skybox}"
+						IsEnabled="{Binding SupportsHorizon}" />
+					<CheckBox
+						Grid.Row="1"
+						Content="{tombLib:Localize Wind}"
+						IsChecked="{Binding Wind}"
+						IsEnabled="{Binding SupportsFlagOutside}" />
+
+					<CheckBox
+						Grid.Column="1"
+						Content="{tombLib:Localize Damage}"
+						IsChecked="{Binding Damage}"
+						IsEnabled="{Binding SupportsFlagDamage}" />
+					<CheckBox
+						Grid.Row="1"
+						Grid.Column="1"
+						Content="{tombLib:Localize Cold}"
+						IsChecked="{Binding Cold}"
+						IsEnabled="{Binding SupportsFlagCold}" />
+
+					<CheckBox
+						Grid.Column="2"
+						Content="{tombLib:Localize NoPathfinding}"
+						IsChecked="{Binding NoPathfinding}" />
+					<CheckBox
+						Grid.Row="1"
+						Grid.Column="2"
+						Content="{tombLib:Localize NoLensflare}"
+						IsChecked="{Binding NoLensflare}"
+						IsEnabled="{Binding SupportsNoLensflare}" />
+
+					<CheckBox
+						Grid.Row="2"
+						Grid.Column="2"
+						Content="{tombLib:Localize NoCaustics}"
+						IsChecked="{Binding NoCaustics}"
+						IsEnabled="{Binding SupportsNoCaustics}" />
+				</controls:SpacedGrid>
+
+				<controls:SpacedGrid Grid.Row="4" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="60" />
+						<ColumnDefinition Width="70" />
+						<ColumnDefinition />
+					</Grid.ColumnDefinitions>
+
+					<Label VerticalAlignment="Bottom" Content="{tombLib:Localize Ambient}" />
+					<Label
+						Grid.Column="1"
+						VerticalAlignment="Bottom"
+						Content="{tombLib:Localize PortalShade}" />
+					<Label
+						Grid.Column="2"
+						VerticalAlignment="Bottom"
+						Content="{tombLib:Localize Effect}" />
+				</controls:SpacedGrid>
+			</controls:SpacedGrid>
+
+			<controls:SpacedGrid
+				Grid.Column="1"
+				ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}"
+				RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<Grid.RowDefinitions>
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition Height="Auto" />
+					<RowDefinition />
+				</Grid.RowDefinitions>
+
+				<Button Command="{Binding EditRoomNameCommand}" Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M 23.90625 3.96875 C 22.859375 3.96875 21.8125 4.375 21 5.1875 L 5.1875 21 L 5.125 21.3125 L 4.03125 26.8125 L 3.71875 28.28125 L 5.1875 27.96875 L 10.6875 26.875 L 11 26.8125 L 26.8125 11 C 28.4375 9.375 28.4375 6.8125 26.8125 5.1875 C 26 4.375 24.953125 3.96875 23.90625 3.96875 Z M 23.90625 5.875 C 24.410156 5.875 24.917969 6.105469 25.40625 6.59375 C 26.378906 7.566406 26.378906 8.621094 25.40625 9.59375 L 24.6875 10.28125 L 21.71875 7.3125 L 22.40625 6.59375 C 22.894531 6.105469 23.402344 5.875 23.90625 5.875 Z M 20.3125 8.71875 L 23.28125 11.6875 L 11.1875 23.78125 C 10.53125 22.5 9.5 21.46875 8.21875 20.8125 Z M 6.9375 22.4375 C 8.136719 22.921875 9.078125 23.863281 9.5625 25.0625 L 6.28125 25.71875 Z" />
+				</Button>
+				<Button
+					Grid.Row="1"
+					Command="{Binding DuplicateRoomCommand}"
+					Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M7 18 7 20 0 20 0 0 16 0 16 3 14 3 14 2 2 2 2 18 7 18ZM8 4 24 4 24 24 8 24 8 4ZM10 22 10 6 22 6 22 22 10 22Z" />
+				</Button>
+				<Button
+					Grid.Row="2"
+					Command="{Binding CropRoomCommand}"
+					Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M0 4 4 4 4 0 6 0 6 16.5 16.5 6 7 6 7 4 18.5 4 22.5 0 24 1.5 20 5.5 20 17 18 17 18 7.5 7.5 18 24 18 24 20 20 20 20 24 18 24 18 20 4 20 4 6 0 6 0 4" />
+				</Button>
+				<Button
+					Grid.Row="3"
+					Command="{Binding SplitRoomCommand}"
+					Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M0 24 0 15.5 2 15.5 2 20.5 9.5 13 11 14.5 3.5 22 8.5 22 8.5 24 0 24ZM24 0 24 8.5 22 8.5 22 3.5 14.5 11 13 9.5 20.5 2 15.5 2 15.5 0 24 0Z" />
+				</Button>
+				<Button
+					Grid.Row="4"
+					Command="{Binding SelectPreviousRoomCommand}"
+					Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M12 0C19.175 0 24 4.825 24 12 24 19.175 19.175 24 12 24 4.825 24 0 19.175 0 12 0 4.825 4.825 0 12 0ZM12 2C18.071 2 22 5.929 22 12 22 18.071 18.071 22 12 22 5.929 22 2 18.071 2 12 2 5.929 5.929 2 12 2ZM7 12 14 5 15.5 6.5 10 12 15.5 17.5 14 19 7 12Z" />
+				</Button>
+
+				<Button
+					Grid.Column="1"
+					Command="{Binding AddNewRoomCommand}"
+					Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M3 0C1.352 0 0 1.352 0 3L0 21C0 22.648 1.352 24 3 24L17 24C18.648 24 20 22.648 20 21L20 6.586 13.414 0 3 0ZM3 2 12 2 12 8 18 8 18 21C18 21.563 17.563 22 17 22L3 22C2.438 22 2 21.563 2 21L2 3C2 2.438 2.438 2 3 2ZM14 3.414 16.586 6 14 6 14 3.414Z" />
+				</Button>
+				<Button
+					Grid.Row="1"
+					Grid.Column="1"
+					Command="{Binding DeleteRoomsCommand}"
+					Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M8.992 0C7.352 0 6 1.352 6 2.992L6 4 0 4 0 6 2 6 2 21C2 22.648 3.352 24 5 24L17 24C18.648 24 20 22.648 20 21L20 6 22 6 22 4 16 4 16 2.992C16 1.352 14.648 0 13.008 0L8.992 0ZM8.992 2 13.008 2C13.57 2 14 2.43 14 2.992L14 4 8 4 8 2.992C8 2.43 8.43 2 8.992 2ZM4 6 18 6 18 21C18 21.563 17.563 22 17 22L5 22C4.438 22 4 21.563 4 21L4 6ZM6 8 6 20 8 20 8 8 6 8ZM10 8 10 20 12 20 12 8 10 8ZM14 8 14 20 16 20 16 8 14 8Z" />
+				</Button>
+				<Button
+					Grid.Row="2"
+					Grid.Column="1"
+					Command="{Binding MoveRoomUpCommand}"
+					Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M7 24 9 24 9 4 14.5 9.5 16 8 8 0 0 8 1.5 9.5 7 4 7 24Z" />
+				</Button>
+				<Button
+					Grid.Row="3"
+					Grid.Column="1"
+					Command="{Binding MoveRoomDownCommand}"
+					Style="{DynamicResource ButtonWithIconOnly}">
+					<Path Data="M9 0 7 0 7 20 1.5 14.5 0 16 8 24 16 16 14.5 14.5 9 20 9 0Z" />
+				</Button>
+				<ToggleButton
+					Grid.Row="4"
+					Grid.Column="1"
+					Command="{Binding LockRoomCommand}"
+					IsChecked="{Binding Locked, Mode=OneWay}"
+					IsEnabled="{Binding CanLockRoom}"
+					Style="{DynamicResource ToggleButtonWithIconOnly}">
+					<Image Source="/TombEditor;component/Resources/icons_general/general_Lock-16.png" />
+				</ToggleButton>
+
+				<ToggleButton
+					Grid.Row="5"
+					Grid.ColumnSpan="2"
+					Command="{Binding HideRoomCommand}"
+					IsChecked="{Binding Hidden, Mode=OneWay}"
+					Style="{DynamicResource ToggleButtonWithIconOnly}">
+					<Image Source="/TombEditor;component/Resources/icons_toolbox/toolbox_Invisible-16.png" />
+				</ToggleButton>
+			</controls:SpacedGrid>
+		</controls:SpacedGrid>
+
+		<controls:SpacedGrid Grid.Row="1" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="60" />
+				<ColumnDefinition Width="70" />
+				<ColumnDefinition />
+				<ColumnDefinition Width="40" />
+			</Grid.ColumnDefinitions>
+
+			<controls:ColorPickerButton
+				Width="60"
+				Command="{Binding EditAmbientLightCommand}"
+				SelectedColor="{Binding AmbientLightColor, Mode=OneWay}" />
+			<ComboBox
+				Grid.Column="1"
+				ItemsSource="{Binding PortalShades}"
+				SelectedIndex="{Binding SelectedPortalShade}" />
+			<ComboBox
+				Grid.Column="2"
+				IsEnabled="{Binding SupportsLightEffect}"
+				ItemsSource="{Binding Effects}"
+				SelectedIndex="{Binding SelectedEffect}" />
+			<controls:NumericUpDown
+				Grid.Column="3"
+				IsEnabled="{Binding SupportsLightEffectStrength}"
+				Maximum="4"
+				Minimum="0"
+				Value="{Binding EffectStrength}" />
+		</controls:SpacedGrid>
+	</Grid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsView.xaml.cs b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsView.xaml.cs
new file mode 100644
index 0000000000..6fea4240c8
--- /dev/null
+++ b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsView.xaml.cs
@@ -0,0 +1,20 @@
+using System.Windows.Controls;
+
+namespace TombEditor.Features.DockableViews.RoomOptionsPanel;
+
+public partial class RoomOptionsView : UserControl
+{
+	private readonly RoomOptionsViewModel _viewModel;
+
+	public RoomOptionsView()
+	{
+		InitializeComponent();
+		_viewModel = new RoomOptionsViewModel(Editor.Instance);
+		DataContext = _viewModel;
+	}
+
+	public void Cleanup()
+	{
+		_viewModel.Cleanup();
+	}
+}
diff --git a/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsViewModel.cs b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsViewModel.cs
new file mode 100644
index 0000000000..e7738ffb31
--- /dev/null
+++ b/TombEditor/Features/DockableViews/RoomOptionsPanel/RoomOptionsViewModel.cs
@@ -0,0 +1,521 @@
+#nullable enable
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows.Input;
+using System.Windows.Media;
+using TombLib.Forms;
+using TombLib.LevelData;
+using TombLib.WPF;
+
+namespace TombEditor.Features.DockableViews.RoomOptionsPanel;
+
+public partial class RoomOptionsViewModel : ObservableObject
+{
+	public IEnumerable<string> Rooms => _editor.Level.Rooms
+		.Select((room, index) => $"{index}: {room?.Name ?? Localizer.Instance["EmptyRoom"]}");
+
+	public IEnumerable<string> RoomTypes
+	{
+		get
+		{
+			var result = new List<string>
+			{
+				"Normal",
+				"Water"
+			};
+
+			if (_editor.Level.Settings.GameVersion == TRVersion.Game.TR3 ||
+				_editor.Level.IsTRX ||
+				_editor.Level.IsNG ||
+				_editor.Level.IsTombEngine)
+				result.Add("Quicksand");
+
+			if (_editor.Level.IsNG)
+				StringEnums.NGRoomTypes.ForEach(result.Add);
+
+			return result;
+		}
+	}
+
+	public IEnumerable<string> ReverbValues
+		=> _editor.Level.Settings.GameVersion.Native() == TRVersion.Game.TR4 && _editor.Level.Settings.GameEnableExtraReverbPresets
+			? StringEnums.ExtraReverberationTypes
+			: StringEnums.ReverberationTypes;
+
+	public IEnumerable<string> PortalShades => new List<string>
+	{
+		"Default",
+		"Smooth",
+		"Sharp"
+	};
+
+	public IEnumerable<string> Effects
+	{
+		get
+		{
+			bool isTR2 = _editor.Level.Settings.GameVersion is TRVersion.Game.TR2;
+
+			return new List<string>
+			{
+				"None",
+				"Default",
+				"Reflection",
+				"Glow",
+				isTR2 ? "Flicker" : "Move",
+				isTR2 ? "Sunset" : "Glow & Move",
+				"Mist"
+			};
+		}
+	}
+
+	public int SelectedRoom
+	{
+		get => Array.IndexOf(_editor.Level.Rooms, _editor.SelectedRoom);
+		set
+		{
+			if (value == -1)
+				return;
+
+			Room selectedRoom = _editor.Level.Rooms[value];
+
+			if (selectedRoom is null)
+				EditorActions.MakeNewRoom(value);
+			else
+				_editor.SelectRoom(selectedRoom);
+		}
+	}
+
+	public string Tags
+	{
+		get => string.Join(' ', _editor.SelectedRoom.Properties.Tags);
+		set
+		{
+			if (_editor.SelectedRoom is null)
+				return;
+
+			_editor.SelectedRoom.Properties.Tags = value.Split(' ', StringSplitOptions.RemoveEmptyEntries).ToList();
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+
+			OnPropertyChanged(nameof(TagsAutoCompleteData));
+		}
+	}
+
+	public bool Skybox
+	{
+		get => _editor.SelectedRoom.Properties.FlagHorizon;
+		set
+		{
+			_editor.SelectedRoom.Properties.FlagHorizon = value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public bool Wind
+	{
+		get => _editor.SelectedRoom.Properties.FlagOutside;
+		set
+		{
+			_editor.SelectedRoom.Properties.FlagOutside = value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public bool Damage
+	{
+		get => _editor.SelectedRoom.Properties.FlagDamage;
+		set
+		{
+			_editor.SelectedRoom.Properties.FlagDamage = value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public bool Cold
+	{
+		get => _editor.SelectedRoom.Properties.FlagCold;
+		set
+		{
+			_editor.SelectedRoom.Properties.FlagCold = value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public bool NoPathfinding
+	{
+		get => _editor.SelectedRoom.Properties.FlagExcludeFromPathFinding;
+		set
+		{
+			_editor.SelectedRoom.Properties.FlagExcludeFromPathFinding = value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public bool NoLensflare
+	{
+		get => _editor.SelectedRoom.Properties.FlagNoLensflare;
+		set
+		{
+			_editor.SelectedRoom.Properties.FlagNoLensflare = value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public bool NoCaustics
+	{
+		get => _editor.SelectedRoom.Properties.FlagNoCaustics;
+		set
+		{
+			_editor.SelectedRoom.Properties.FlagNoCaustics = value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public int SelectedRoomType
+	{
+		get
+		{
+			Room room = _editor.SelectedRoom;
+
+			// Cleverly switch room types dependent on game version.
+			// We disable rain/snow types for TombEngine because it is expected to set these options with triggers and/or script.
+
+			int roomType;
+
+			if (room.Properties.Type is RoomType.Quicksand &&
+				_editor.Level.Settings.GameVersion is not TRVersion.Game.TR3 and not TRVersion.Game.TRNG and not TRVersion.Game.TombEngine &&
+				!_editor.Level.IsTRX)
+				roomType = -1;
+			else if (room.Properties.Type is RoomType.Rain or RoomType.Snow && _editor.Level.Settings.GameVersion is not TRVersion.Game.TRNG)
+				roomType = -1;
+			else
+			{
+				roomType = room.Properties.Type switch
+				{
+					RoomType.Normal => 0,
+					RoomType.Water => 1,
+					RoomType.Quicksand => 2,
+					RoomType.Rain => 3 + room.Properties.TypeStrength,
+					RoomType.Snow => 7 + room.Properties.TypeStrength,
+					_ => -1
+				};
+			}
+
+			// If selected type is -1 it means this room type is unsupported in current version. Throw a message about it.
+			if (roomType == -1)
+				_editor.SendMessage("Current room type is not supported in this engine version.\nChange it manually or switch engine version.", PopupType.Warning);
+
+			return roomType;
+		}
+		set
+		{
+			RoomType newType;
+			byte newStrength = 0;
+
+			switch (value)
+			{
+				case -1:
+					// Wrong type, do nothing
+					return;
+
+				case 0:
+					newType = RoomType.Normal;
+					break;
+
+				case 1:
+					newType = RoomType.Water;
+					break;
+
+				case 2:
+					newType = RoomType.Quicksand;
+					break;
+
+				default:
+					if (value <= 6)
+					{
+						newType = RoomType.Rain;
+						newStrength = (byte)(value - 3);
+					}
+					else
+					{
+						newType = RoomType.Snow;
+						newStrength = (byte)(value - 7);
+					}
+
+					break;
+			}
+
+			if (_editor.SelectedRoom.Properties.Type != newType || _editor.SelectedRoom.Properties.TypeStrength != newStrength)
+			{
+				_editor.SelectedRoom.Properties.Type = newType;
+				_editor.SelectedRoom.Properties.TypeStrength = newStrength;
+				_editor.RoomPropertiesChange(_editor.SelectedRoom);
+			}
+		}
+	}
+
+	public int SelectedFlipMap
+	{
+		get
+		{
+			Room room = _editor.SelectedRoom;
+
+			if (!room.Alternated)
+				return 0;
+
+			int index = room.AlternateGroup + 1;
+			return index < FlipMaps.Count ? index : -1;
+		}
+		set
+		{
+			if (_editor.SelectedRoom is null)
+				return;
+
+			Room room = _editor.SelectedRoom;
+			short alternateGroupIndex = (short)(value - 1);
+
+			if (room.Alternated)
+			{
+				if (alternateGroupIndex == -1)
+				{
+					// Delete flipped room
+					EditorActions.AlternateRoomDisableWithWarning(room, WPFUtils.GetWin32WindowFromCaller(this));
+				}
+				else
+				{
+					// Change flipped map number, not much to do here
+					if (room.AlternateGroup != alternateGroupIndex &&
+						room.AlternateOpposite.AlternateGroup != alternateGroupIndex)
+					{
+						room.AlternateGroup = alternateGroupIndex;
+						room.AlternateOpposite.AlternateGroup = alternateGroupIndex;
+						_editor.RoomPropertiesChange(room);
+						_editor.RoomPropertiesChange(room.AlternateOpposite);
+					}
+				}
+			}
+			else if (alternateGroupIndex != -1)
+			{
+				// Create a new flipped room
+				EditorActions.AlternateRoomEnable(room, alternateGroupIndex);
+			}
+
+			// Update combo box even if nothing changed internally
+			// to correct invalid user input
+			EditorEventRaised(new Editor.RoomPropertiesChangedEvent { Room = room });
+		}
+	}
+
+	public int SelectedReverb
+	{
+		get => _editor.SelectedRoom.Properties.Reverberation;
+		set
+		{
+			if (_editor.SelectedRoom.Properties.Reverberation == value)
+				return;
+
+			_editor.SelectedRoom.Properties.Reverberation = (byte)value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public int SelectedPortalShade
+	{
+		get => (int)_editor.SelectedRoom.Properties.LightInterpolationMode;
+		set
+		{
+			if (_editor.SelectedRoom.Properties.LightInterpolationMode == (RoomLightInterpolationMode)value)
+				return;
+
+			_editor.SelectedRoom.Properties.LightInterpolationMode = (RoomLightInterpolationMode)value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public int SelectedEffect
+	{
+		get => (int)_editor.SelectedRoom.Properties.LightEffect;
+		set
+		{
+			if (_editor.SelectedRoom.Properties.LightEffect == (RoomLightEffect)value)
+				return;
+
+			_editor.SelectedRoom.Properties.LightEffect = (RoomLightEffect)value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public byte EffectStrength
+	{
+		get => _editor.SelectedRoom.Properties.LightEffectStrength;
+		set
+		{
+			_editor.SelectedRoom.Properties.LightEffectStrength = value;
+			_editor.RoomPropertiesChange(_editor.SelectedRoom);
+		}
+	}
+
+	public IReadOnlyList<string> TagsAutoCompleteData => _editor.Level.Rooms
+		.Where(room => room?.ExistsInLevel == true)
+		.SelectMany(room => room.Properties.Tags)
+		.Distinct()
+		.ToList();
+
+	public bool Hidden => _editor.SelectedRoom.Properties.Hidden;
+
+	public Color AmbientLightColor => _editor.SelectedRoom.Properties.AmbientLight.ToWPFColor();
+
+	[ObservableProperty] private bool supportsHorizon;
+	[ObservableProperty] private bool supportsFlagOutside;
+	[ObservableProperty] private bool supportsFlagCold;
+	[ObservableProperty] private bool supportsFlagDamage;
+	[ObservableProperty] private bool supportsNoLensflare;
+	[ObservableProperty] private bool supportsNoCaustics;
+	[ObservableProperty] private bool supportsReverb;
+	[ObservableProperty] private bool supportsLightEffect;
+	[ObservableProperty] private bool supportsLightEffectStrength;
+	[ObservableProperty] private bool canLockRoom = true;
+
+	[ObservableProperty] private bool locked;
+
+	public ICommand EditRoomNameCommand { get; }
+	public ICommand AddNewRoomCommand { get; }
+	public ICommand DuplicateRoomCommand { get; }
+	public ICommand DeleteRoomsCommand { get; }
+	public ICommand CropRoomCommand { get; }
+	public ICommand MoveRoomUpCommand { get; }
+	public ICommand SplitRoomCommand { get; }
+	public ICommand MoveRoomDownCommand { get; }
+	public ICommand SelectPreviousRoomCommand { get; }
+	public ICommand LockRoomCommand { get; }
+	public ICommand HideRoomCommand { get; }
+	public ICommand EditAmbientLightCommand { get; }
+
+	private readonly Editor _editor;
+
+	public ObservableCollection<string> FlipMaps { get; } = new();
+
+	public RoomOptionsViewModel(Editor editor)
+	{
+		_editor = editor;
+		_editor.EditorEventRaised += EditorEventRaised;
+		RepopulateFlipMaps();
+
+		EditRoomNameCommand = CommandHandler.GetCommand("EditRoomName", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		AddNewRoomCommand = CommandHandler.GetCommand("AddNewRoom", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		DuplicateRoomCommand = CommandHandler.GetCommand("DuplicateRoom", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		DeleteRoomsCommand = CommandHandler.GetCommand("DeleteRooms", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		CropRoomCommand = CommandHandler.GetCommand("CropRoom", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		MoveRoomUpCommand = CommandHandler.GetCommand("MoveRoomUp", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SplitRoomCommand = CommandHandler.GetCommand("SplitRoom", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		MoveRoomDownCommand = CommandHandler.GetCommand("MoveRoomDown", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SelectPreviousRoomCommand = CommandHandler.GetCommand("SelectPreviousRoom", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		LockRoomCommand = CommandHandler.GetCommand("LockRoom", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		HideRoomCommand = CommandHandler.GetCommand("HideRoom", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		EditAmbientLightCommand = CommandHandler.GetCommand("EditAmbientLight", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+	}
+
+	public void Cleanup()
+	{
+		_editor.EditorEventRaised -= EditorEventRaised;
+	}
+
+	private void RepopulateFlipMaps()
+	{
+		int index = FlipMaps.Count > 0 ? FlipMaps.IndexOf(FlipMaps.FirstOrDefault()) : -1;
+
+		FlipMaps.Clear();
+		FlipMaps.Add("None");
+
+		int flipmapCount = _editor.Level.Settings.GameVersion == TRVersion.Game.TombEngine ? byte.MaxValue : 15;
+
+		for (int i = 0; i < flipmapCount; i++)
+			FlipMaps.Add(i.ToString());
+	}
+
+	private void EditorEventRaised(IEditorEvent obj)
+	{
+		// Disable version-specific controls.
+		if (obj is Editor.InitEvent or
+			Editor.GameVersionChangedEvent or
+			Editor.LevelChangedEvent)
+		{
+			var version = _editor.Level.Settings.GameVersion;
+			bool isNGorTEN = version is TRVersion.Game.TRNG or TRVersion.Game.TombEngine;
+			bool isTR1 = version.Native() == TRVersion.Game.TR1;
+			bool isTEN = version is TRVersion.Game.TombEngine;
+
+			SupportsHorizon = !isTR1 || _editor.Level.IsTRX;
+			SupportsFlagOutside = !isTR1 || _editor.Level.IsTRX;
+			SupportsFlagCold = isNGorTEN;
+			SupportsFlagDamage = isNGorTEN;
+			SupportsNoLensflare = version.SupportsLensflare();
+			SupportsNoCaustics = isTEN;
+			SupportsReverb = version.SupportsReverberation();
+
+			OnPropertyChanged(nameof(RoomTypes));
+			OnPropertyChanged(nameof(ReverbValues));
+			OnPropertyChanged(nameof(Effects));
+			RepopulateFlipMaps();
+
+			SupportsLightEffect = !isTR1;
+			SupportsLightEffectStrength = !isTR1;
+		}
+
+		// Update the room list.
+		if (obj is Editor.InitEvent or Editor.RoomListChangedEvent)
+		{
+			int cachedRoomIndex = SelectedRoom;
+
+			OnPropertyChanged(nameof(Rooms));
+
+			SelectedRoom = cachedRoomIndex;
+			OnPropertyChanged(nameof(SelectedRoom));
+		}
+
+		// Update tag list.
+		if (obj is Editor.LevelChangedEvent or Editor.SelectedRoomChangedEvent)
+			OnPropertyChanged(nameof(TagsAutoCompleteData));
+
+		// Update all room property controls.
+		if (obj is Editor.InitEvent || obj is Editor.SelectedRoomChangedEvent || obj is Editor.LevelChangedEvent ||
+			_editor.IsSelectedRoomEvent(obj as Editor.RoomPropertiesChangedEvent))
+		{
+			if (obj is Editor.SelectedRoomChangedEvent)
+				OnPropertyChanged(nameof(SelectedRoom));
+
+			OnPropertyChanged(nameof(Tags));
+			OnPropertyChanged(nameof(Skybox));
+			OnPropertyChanged(nameof(Wind));
+			OnPropertyChanged(nameof(Damage));
+			OnPropertyChanged(nameof(Cold));
+			OnPropertyChanged(nameof(NoPathfinding));
+			OnPropertyChanged(nameof(NoLensflare));
+			OnPropertyChanged(nameof(NoCaustics));
+			OnPropertyChanged(nameof(SelectedRoomType));
+			OnPropertyChanged(nameof(SelectedFlipMap));
+			OnPropertyChanged(nameof(SelectedReverb));
+			OnPropertyChanged(nameof(SelectedPortalShade));
+			OnPropertyChanged(nameof(SelectedEffect));
+			OnPropertyChanged(nameof(EffectStrength));
+			OnPropertyChanged(nameof(Hidden));
+			OnPropertyChanged(nameof(AmbientLightColor));
+
+			Room room = _editor.SelectedRoom;
+
+			if (room.AlternateBaseRoom != null)
+			{
+				CanLockRoom = false;
+				Locked = room.AlternateBaseRoom.Properties.Locked;
+			}
+			else
+			{
+				CanLockRoom = true;
+				Locked = room.Properties.Locked;
+			}
+		}
+	}
+}
diff --git a/TombEditor/Features/DockableViews/SectorOptionsPanel/Panel2DGrid.cs b/TombEditor/Features/DockableViews/SectorOptionsPanel/Panel2DGrid.cs
new file mode 100644
index 0000000000..360e77b7e1
--- /dev/null
+++ b/TombEditor/Features/DockableViews/SectorOptionsPanel/Panel2DGrid.cs
@@ -0,0 +1,546 @@
+#nullable enable
+
+using NLog;
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Numerics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using TombLib;
+using TombLib.LevelData;
+using TombLib.Rendering;
+using TombLib.Utils;
+using TombLib.WPF;
+
+namespace TombEditor.Features.DockableViews.SectorOptionsPanel;
+
+/// <summary>
+/// Native WPF replacement for the WinForms Panel2DGrid control.
+/// Uses OnRender with DrawingContext for hardware-accelerated rendering.
+/// </summary>
+public class Panel2DGrid : FrameworkElement
+{
+	private static readonly Logger logger = LogManager.GetCurrentClassLogger();
+
+	private const double OutlineSectorColoringInfoWidth = 3.0;
+
+	private readonly Editor _editor = null!;
+	private Room _room;
+	private bool _doSectorSelection;
+
+	private static readonly Pen GridPen = WPFUtils.CreateFrozenPen(Color.FromArgb(140, 0, 0, 0), 1.0);
+	private static readonly Pen BorderPen = WPFUtils.CreateFrozenPen(Colors.Black, 1.0);
+	private static readonly Pen SelectedPortalPen = WPFUtils.CreateFrozenPen(Colors.YellowGreen, 2.0);
+	private static readonly Pen SelectedTriggerPen = WPFUtils.CreateFrozenPen(Colors.White, 2.0);
+
+	public Room Room
+	{
+		get => _room;
+		set
+		{
+			if (_room == value)
+				return;
+
+			_room = value;
+			InvalidateVisual();
+		}
+	}
+
+	public Panel2DGrid()
+	{
+		ClipToBounds = true;
+		Focusable = true;
+		SnapsToDevicePixels = true;
+		UseLayoutRounding = true;
+		RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
+
+		if (DesignerProperties.GetIsInDesignMode(this))
+			return;
+
+		_editor = Editor.Instance;
+		_editor.EditorEventRaised += EditorEventRaised;
+	}
+
+	public void Dispose()
+	{
+		_editor.EditorEventRaised -= EditorEventRaised;
+	}
+
+	private void EditorEventRaised(IEditorEvent obj)
+	{
+		if (obj is SectorColoringManager.ChangeSectorColoringInfoEvent ||
+			obj is Editor.GameVersionChangedEvent ||
+			obj is Editor.SelectedSectorsChangedEvent ||
+			obj is Editor.RoomSectorPropertiesChangedEvent ||
+			obj is Editor.ObjectChangedEvent ||
+			obj is Editor.RoomGeometryChangedEvent ||
+			obj is Editor.ConfigurationChangedEvent ||
+			(obj is Editor.SelectedObjectChangedEvent e && IsObjectChangeRelevant(e)))
+		{
+			InvalidateVisual();
+		}
+
+		if (obj is Editor.ActionChangedEvent actionChanged)
+		{
+			bool isCameraRelocate = actionChanged.Current is EditorActionRelocateCamera;
+			Cursor = isCameraRelocate ? Cursors.Cross : Cursors.Arrow;
+		}
+	}
+
+	private static bool IsObjectChangeRelevant(Editor.SelectedObjectChangedEvent e)
+	{
+		return e.Previous is SectorBasedObjectInstance || e.Current is SectorBasedObjectInstance;
+	}
+
+	// Grid coordinate calculations.
+
+	private VectorInt2 RoomSize => Room.SectorSize;
+
+	private VectorInt2 GetGridDimensions()
+	{
+		return VectorInt2.Max(RoomSize, new VectorInt2(Room.DefaultRoomDimensions, Room.DefaultRoomDimensions));
+	}
+
+	private double GetGridStep()
+	{
+		var gridDimensions = GetGridDimensions();
+		double w = ActualWidth;
+		double h = ActualHeight;
+
+		if (w * gridDimensions.Y < h * gridDimensions.X)
+			return w / gridDimensions.X;
+		else
+			return h / gridDimensions.Y;
+	}
+
+	private Rect GetVisualAreaTotal()
+	{
+		double w = ActualWidth;
+		double h = ActualHeight;
+		var gridDimensions = GetGridDimensions();
+		double gridStep = GetGridStep();
+		double gridW = gridDimensions.X * gridStep;
+		double gridH = gridDimensions.Y * gridStep;
+
+		return new Rect(
+			(w - gridW) * 0.5,
+			(h - gridH) * 0.5,
+			gridW,
+			gridH);
+	}
+
+	private Rect GetVisualAreaRoom()
+	{
+		var totalArea = GetVisualAreaTotal();
+		double gridStep = GetGridStep();
+		var gridDimensions = GetGridDimensions();
+		var roomSize = RoomSize;
+
+		return new Rect(
+			totalArea.X + (gridStep * ((gridDimensions.X - roomSize.X) / 2)),
+			totalArea.Y + (gridStep * ((gridDimensions.Y - roomSize.Y) / 2)),
+			gridStep * roomSize.X,
+			gridStep * roomSize.Y);
+	}
+
+	private Point ToVisualCoord(VectorInt2 sectorCoord)
+	{
+		var roomArea = GetVisualAreaRoom();
+		double gridStep = GetGridStep();
+		return new Point(
+			(sectorCoord.X * gridStep) + roomArea.X,
+			roomArea.Bottom - ((sectorCoord.Y + 1) * gridStep));
+	}
+
+	private Rect ToVisualCoord(RectangleInt2 sectorArea)
+	{
+		var p0 = ToVisualCoord(sectorArea.Start);
+		var p1 = ToVisualCoord(sectorArea.End);
+		double gridStep = GetGridStep();
+		return new Rect(
+			Math.Min(p0.X, p1.X), Math.Min(p0.Y, p1.Y),
+			Math.Abs(p1.X - p0.X) + gridStep, Math.Abs(p1.Y - p0.Y) + gridStep);
+	}
+
+	private VectorInt2 FromVisualCoord(Point point)
+	{
+		var roomArea = GetVisualAreaRoom();
+		double gridStep = GetGridStep();
+		var roomSize = RoomSize;
+		return new VectorInt2(
+			(int)Math.Max(0, Math.Min(roomSize.X - 1, (point.X - roomArea.X) / gridStep)),
+			(int)Math.Max(0, Math.Min(roomSize.Y - 1, (roomArea.Bottom - point.Y) / gridStep)));
+	}
+
+	// Mouse interaction.
+
+	protected override void OnMouseLeftButtonDown(MouseButtonEventArgs e)
+	{
+		base.OnMouseLeftButtonDown(e);
+		CaptureMouse();
+		HandleMouseDown(e.GetPosition(this), isRightButton: false);
+		e.Handled = true;
+	}
+
+	protected override void OnMouseRightButtonDown(MouseButtonEventArgs e)
+	{
+		base.OnMouseRightButtonDown(e);
+		HandleMouseDown(e.GetPosition(this), isRightButton: true);
+		e.Handled = true;
+	}
+
+	protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+	{
+		base.OnMouseLeftButtonUp(e);
+		_doSectorSelection = false;
+		ReleaseMouseCapture();
+	}
+
+	protected override void OnMouseRightButtonUp(MouseButtonEventArgs e)
+	{
+		base.OnMouseRightButtonUp(e);
+		_doSectorSelection = false;
+	}
+
+	protected override void OnMouseMove(MouseEventArgs e)
+	{
+		base.OnMouseMove(e);
+
+		if (_editor?.SelectedRoom == null || _editor.Action is EditorActionRelocateCamera)
+			return;
+
+		if (e.LeftButton == MouseButtonState.Pressed && _doSectorSelection)
+			_editor.SelectedSectors = new SectorSelection { Start = _editor.SelectedSectors.Start, End = FromVisualCoord(e.GetPosition(this)) };
+	}
+
+	private void HandleMouseDown(Point position, bool isRightButton)
+	{
+		if (_editor == null || Room == null)
+			return;
+
+		// Move camera to selected sector.
+		if (_editor.Action is EditorActionRelocateCamera)
+		{
+			_editor.MoveCameraToSector(FromVisualCoord(position));
+			return;
+		}
+
+		var sectorPos = FromVisualCoord(position);
+		var selectedSectorObject = _editor.SelectedObject as SectorBasedObjectInstance;
+		bool isAltDown = Keyboard.Modifiers.HasFlag(ModifierKeys.Alt);
+
+		if (!isRightButton && !isAltDown)
+		{
+			if (selectedSectorObject != null &&
+				selectedSectorObject.Room == Room &&
+				selectedSectorObject.Area.Contains(sectorPos))
+			{
+				HandleSectorObjectClick(selectedSectorObject);
+			}
+			else
+			{
+				_editor.SelectedSectors = new SectorSelection { Start = sectorPos, End = sectorPos };
+
+				if (selectedSectorObject != null)
+					_editor.SelectedObject = null;
+				_doSectorSelection = true;
+			}
+		}
+		else
+		{
+			SelectNextObjectAtSector(sectorPos, selectedSectorObject);
+		}
+	}
+
+	private void HandleSectorObjectClick(SectorBasedObjectInstance selectedSectorObject)
+	{
+		if (selectedSectorObject is PortalInstance portal)
+		{
+			var room = Room;
+
+			if (room.AlternateBaseRoom != null && portal.AdjoiningRoom.Alternated)
+			{
+				_editor.SelectRoom(portal.AdjoiningRoom.AlternateRoom);
+				_editor.SelectedObject = portal.FindOppositePortal(room).FindAlternatePortal(portal.AdjoiningRoom.AlternateRoom);
+			}
+			else
+			{
+				_editor.SelectRoom(portal.AdjoiningRoom);
+				_editor.SelectedObject = portal.FindOppositePortal(room);
+			}
+		}
+		else if (selectedSectorObject is TriggerInstance)
+		{
+			EditorActions.EditObject(selectedSectorObject, null);
+		}
+	}
+
+	private void SelectNextObjectAtSector(VectorInt2 sectorPos, SectorBasedObjectInstance selectedSectorObject)
+	{
+		var portalsInRoom = Room.Portals.Cast<SectorBasedObjectInstance>();
+		var triggersInRoom = Room.Triggers.Cast<SectorBasedObjectInstance>();
+		var relevantObjects = portalsInRoom.Concat(triggersInRoom)
+			.Where(obj => obj.Area.Contains(sectorPos));
+
+		var nextObject = relevantObjects
+			.FindFirstAfterWithWrapAround(obj => obj == selectedSectorObject, obj => true);
+
+		if (nextObject != null)
+		{
+			_editor.SelectedObject = nextObject;
+
+			// Show tooltip near the cursor.
+			ToolTip = new ToolTip
+			{
+				Content = nextObject.ToString(),
+				IsOpen = true,
+				StaysOpen = false
+			};
+		}
+	}
+
+	// Rendering.
+
+	protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
+	{
+		base.OnRenderSizeChanged(sizeInfo);
+		InvalidateVisual();
+	}
+
+	protected override void OnRender(DrawingContext dc)
+	{
+		if (_editor == null || Room == null)
+		{
+			DrawDesignPlaceholder(dc);
+			return;
+		}
+
+		try
+		{
+			var totalArea = GetVisualAreaTotal();
+			var roomArea = GetVisualAreaRoom();
+			var gridDimensions = GetGridDimensions();
+			double gridStep = GetGridStep();
+			var roomSize = RoomSize;
+
+			// Draw background.
+			var bgBrush = WPFUtils.CreateFrozenBrush(_editor.Configuration.UI_ColorScheme.Color2DBackground.ToWPFColor());
+			dc.DrawRectangle(bgBrush, null, totalArea);
+
+			// Draw sector tiles.
+			for (int x = 0; x < roomSize.X; x++)
+			{
+				for (int z = 0; z < roomSize.Y; z++)
+				{
+					var tileRect = new Rect(
+						roomArea.X + (x * gridStep),
+						roomArea.Y + ((roomSize.Y - 1 - z) * gridStep),
+						gridStep,
+						gridStep);
+					PaintSectorTile(dc, tileRect, x, z);
+				}
+			}
+
+			// Draw grid lines.
+			DrawGridLines(dc, totalArea, gridDimensions, gridStep);
+
+			// Draw selection.
+			DrawSelection(dc);
+		}
+		catch (Exception exc)
+		{
+			logger.Error(exc, "An exception occured while drawing the 2D grid.");
+		}
+	}
+
+	private void DrawGridLines(DrawingContext dc, Rect totalArea, VectorInt2 gridDimensions, double gridStep)
+	{
+		for (int x = 1; x < gridDimensions.X; ++x)
+		{
+			double xPos = totalArea.X + (x * gridStep);
+			dc.DrawLine(GridPen, new Point(xPos, totalArea.Y), new Point(xPos, totalArea.Y + (gridStep * gridDimensions.Y)));
+		}
+
+		for (int y = 1; y < gridDimensions.Y; ++y)
+		{
+			double yPos = totalArea.Y + (y * gridStep);
+			dc.DrawLine(GridPen, new Point(totalArea.X, yPos), new Point(totalArea.X + (gridStep * gridDimensions.X), yPos));
+		}
+
+		// Draw outer border inset by half the pen thickness so the stroke doesn't get clipped.
+		const double half = 0.5;
+		dc.DrawRectangle(null, BorderPen, new Rect(
+			totalArea.X + half,
+			totalArea.Y + half,
+			totalArea.Width - 1.0,
+			totalArea.Height - 1.0));
+	}
+
+	private void DrawSelection(DrawingContext dc)
+	{
+		if (_editor.SelectedSectors.Valid)
+		{
+			var selectionPen = WPFUtils.CreateFrozenPen(_editor.Configuration.UI_ColorScheme.ColorSelection.ToWPFColor(), 2.0);
+			dc.DrawRectangle(null, selectionPen, ToVisualCoord(_editor.SelectedSectors.Area));
+		}
+
+		if (_editor.SelectedObject is SectorBasedObjectInstance instance && instance.Room == Room)
+		{
+			var pen = instance is PortalInstance ? SelectedPortalPen : SelectedTriggerPen;
+			dc.DrawRectangle(null, pen, ToVisualCoord(instance.Area));
+		}
+	}
+
+	private void PaintSectorTile(DrawingContext dc, Rect sectorArea, int x, int z)
+	{
+		var coloringInfos = _editor.SectorColoringManager.ColoringInfo.GetColors(
+			_editor.Configuration.UI_ColorScheme, Room, x, z,
+			_editor.Configuration.UI_ProbeAttributesThroughPortals);
+
+		if (coloringInfos == null)
+			return;
+
+		for (int i = 0; i < coloringInfos.Count; i++)
+		{
+			var info = coloringInfos[i];
+			var brush = WPFUtils.CreateFrozenBrush(info.Color.ToWPFColor());
+
+			switch (info.Shape)
+			{
+				case SectorColoringShape.Rectangle:
+					dc.DrawRectangle(brush, null, sectorArea);
+					break;
+
+				case SectorColoringShape.Frame:
+					DrawFrame(dc, sectorArea, info.Color);
+					break;
+
+				case SectorColoringShape.Hatch:
+					DrawHatch(dc, sectorArea, info.Color);
+					break;
+
+				case SectorColoringShape.EdgeZp:
+				case SectorColoringShape.EdgeZn:
+				case SectorColoringShape.EdgeXp:
+				case SectorColoringShape.EdgeXn:
+					DrawEdge(dc, sectorArea, info.Shape, brush);
+					break;
+
+				case SectorColoringShape.TriangleXnZn:
+				case SectorColoringShape.TriangleXnZp:
+				case SectorColoringShape.TriangleXpZn:
+				case SectorColoringShape.TriangleXpZp:
+					DrawTriangle(dc, sectorArea, info.Shape, brush);
+					break;
+			}
+		}
+	}
+
+	private void DrawFrame(DrawingContext dc, Rect sectorArea, Vector4 color)
+	{
+		var pen = WPFUtils.CreateFrozenPen(color.ToWPFColor(), OutlineSectorColoringInfoWidth);
+		double half = OutlineSectorColoringInfoWidth / 2.0;
+		var frameRect = new Rect(
+			sectorArea.X + half,
+			sectorArea.Y + half,
+			sectorArea.Width - OutlineSectorColoringInfoWidth,
+			sectorArea.Height - OutlineSectorColoringInfoWidth);
+		dc.DrawRectangle(null, pen, frameRect);
+	}
+
+	private void DrawHatch(DrawingContext dc, Rect sectorArea, Vector4 color)
+	{
+		// Simulate WideUpwardDiagonal hatch pattern with diagonal lines.
+		const double penThickness = 3.5;
+		const double spacing = 8.0;
+
+		var pen = WPFUtils.CreateFrozenPen(color.ToWPFColor(), penThickness);
+
+		dc.PushClip(new RectangleGeometry(sectorArea));
+
+		double startOffset = -sectorArea.Height / 2.0;
+		double totalRange = sectorArea.Width + sectorArea.Height;
+		const double margin = (penThickness / 2.0) + 0.5; // Half pen width + small margin
+
+		// Start from negative offset to ensure corners are covered.
+		// Extend lines beyond the rect to account for pen width; clipping will cut them off.
+		for (double offset = startOffset; offset < totalRange; offset += spacing)
+		{
+			dc.DrawLine(pen,
+				new Point(sectorArea.X - sectorArea.Height + offset - margin, sectorArea.Bottom + margin),
+				new Point(sectorArea.X + offset + margin, sectorArea.Top - margin));
+		}
+
+		dc.Pop();
+	}
+
+	private static void DrawEdge(DrawingContext dc, Rect sectorArea, SectorColoringShape shape, Brush brush)
+	{
+		const double w = OutlineSectorColoringInfoWidth;
+
+		var edgeRect = shape switch
+		{
+			SectorColoringShape.EdgeZp => new Rect(sectorArea.X, sectorArea.Y, sectorArea.Width, w),
+			SectorColoringShape.EdgeZn => new Rect(sectorArea.X, sectorArea.Bottom - w, sectorArea.Width, w),
+			SectorColoringShape.EdgeXp => new Rect(sectorArea.Right - w, sectorArea.Y, w, sectorArea.Height),
+			_ => new Rect(sectorArea.X, sectorArea.Y, w, sectorArea.Height)
+		};
+
+		dc.DrawRectangle(brush, null, edgeRect);
+	}
+
+	private static void DrawTriangle(DrawingContext dc, Rect sectorArea, SectorColoringShape shape, Brush brush)
+	{
+		var (p0, p1, p2) = shape switch
+		{
+			SectorColoringShape.TriangleXnZn => (
+				new Point(sectorArea.Left, sectorArea.Top),
+				new Point(sectorArea.Left, sectorArea.Bottom),
+				new Point(sectorArea.Right, sectorArea.Bottom)),
+			SectorColoringShape.TriangleXnZp => (
+				new Point(sectorArea.Left, sectorArea.Bottom),
+				new Point(sectorArea.Left, sectorArea.Top),
+				new Point(sectorArea.Right, sectorArea.Top)),
+			SectorColoringShape.TriangleXpZn => (
+				new Point(sectorArea.Left, sectorArea.Bottom),
+				new Point(sectorArea.Right, sectorArea.Top),
+				new Point(sectorArea.Right, sectorArea.Bottom)),
+			_ => (
+				new Point(sectorArea.Left, sectorArea.Top),
+				new Point(sectorArea.Right, sectorArea.Top),
+				new Point(sectorArea.Right, sectorArea.Bottom))
+		};
+
+		var geometry = new StreamGeometry();
+		using (var ctx = geometry.Open())
+		{
+			ctx.BeginFigure(p0, true, true);
+			ctx.LineTo(p1, false, false);
+			ctx.LineTo(p2, false, false);
+		}
+
+		geometry.Freeze();
+		dc.DrawGeometry(brush, null, geometry);
+	}
+
+	// Helper methods.
+
+	private void DrawDesignPlaceholder(DrawingContext dc)
+	{
+		dc.DrawRectangle(WPFUtils.CreateFrozenBrush(Color.FromRgb(50, 50, 50)), BorderPen,
+			new Rect(0, 0, ActualWidth, ActualHeight));
+
+		var text = new FormattedText("2D Grid",
+			System.Globalization.CultureInfo.InvariantCulture,
+			FlowDirection.LeftToRight,
+			new Typeface("Segoe UI"), 12.0, Brushes.Gray,
+			VisualTreeHelper.GetDpi(this).PixelsPerDip);
+
+		dc.DrawText(text, new Point(
+			(ActualWidth - text.Width) / 2.0,
+			(ActualHeight - text.Height) / 2.0));
+	}
+}
diff --git a/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptions.Designer.cs b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptions.Designer.cs
new file mode 100644
index 0000000000..e2bdcc76da
--- /dev/null
+++ b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptions.Designer.cs
@@ -0,0 +1,40 @@
+namespace TombEditor.Features.DockableViews.SectorOptionsPanel
+{
+    partial class SectorOptions
+    {
+        private System.ComponentModel.IContainer components = null;
+
+        #region Component Designer generated code
+
+        private void InitializeComponent()
+        {
+            _elementHost = new System.Windows.Forms.Integration.ElementHost();
+            _sectorOptionsView = new SectorOptionsView();
+            SuspendLayout();
+            // 
+            // _elementHost
+            // 
+            _elementHost.Dock = System.Windows.Forms.DockStyle.Fill;
+            _elementHost.Name = "_elementHost";
+            _elementHost.Child = _sectorOptionsView;
+            // 
+            // SectorOptions
+            // 
+            AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            Controls.Add(_elementHost);
+            DockText = "Sector Options";
+            MinimumSize = new System.Drawing.Size(284, 278);
+            Name = "SectorOptions";
+            SerializationKey = "SectorOptions";
+            Size = new System.Drawing.Size(284, 278);
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Integration.ElementHost _elementHost;
+        private SectorOptionsView _sectorOptionsView;
+    }
+}
diff --git a/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptions.cs b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptions.cs
new file mode 100644
index 0000000000..c50378d589
--- /dev/null
+++ b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptions.cs
@@ -0,0 +1,22 @@
+using DarkUI.Docking;
+
+namespace TombEditor.Features.DockableViews.SectorOptionsPanel;
+
+public partial class SectorOptions : DarkToolWindow
+{
+	public SectorOptions()
+	{
+		InitializeComponent();
+	}
+
+	protected override void Dispose(bool disposing)
+	{
+		if (disposing)
+		{
+			_sectorOptionsView?.Cleanup();
+			components?.Dispose();
+		}
+
+		base.Dispose(disposing);
+	}
+}
diff --git a/TombEditor/ToolWindows/SectorOptions.resx b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptions.resx
similarity index 100%
rename from TombEditor/ToolWindows/SectorOptions.resx
rename to TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptions.resx
diff --git a/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsView.xaml b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsView.xaml
new file mode 100644
index 0000000000..e14931f2c6
--- /dev/null
+++ b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsView.xaml
@@ -0,0 +1,341 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.SectorOptionsPanel.SectorOptionsView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:conv="clr-namespace:DarkUI.WPF.Converters;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+	xmlns:local="clr-namespace:TombEditor.Features.DockableViews.SectorOptionsPanel"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:rendering="clr-namespace:TombLib.Rendering;assembly=TombLib.Rendering"
+	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
+	MinWidth="285"
+	MinHeight="256"
+	d:DesignHeight="256"
+	d:DesignWidth="285"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<UserControl.Resources>
+		<ResourceDictionary>
+			<ResourceDictionary.MergedDictionaries>
+				<ResourceDictionary>
+					<conv:VectorToBrushConverter x:Key="VectorToBrushConverter" />
+				</ResourceDictionary>
+			</ResourceDictionary.MergedDictionaries>
+		</ResourceDictionary>
+	</UserControl.Resources>
+
+	<controls:SpacedGrid
+		Margin="{x:Static darkUI:Defaults.SmallThickness}"
+		ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}"
+		RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition />
+			<ColumnDefinition Width="Auto" />
+		</Grid.ColumnDefinitions>
+		<Grid.RowDefinitions>
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<local:Panel2DGrid x:Name="Panel2DGridControl" />
+
+		<controls:SpacedGrid
+			Grid.Column="1"
+			ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}"
+			RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+
+			<Button
+				x:Name="butFloor"
+				Background="{Binding FloorColor, Converter={StaticResource VectorToBrushConverter}}"
+				Command="{Binding SetFloorCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetFloor}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Trigger}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butFloor_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_Floor_1-16.png" />
+			</Button>
+			<Button
+				x:Name="butCeiling"
+				Grid.Column="1"
+				Background="{Binding FloorColor, Converter={StaticResource VectorToBrushConverter}}"
+				Command="{Binding SetCeilingCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetCeiling}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Trigger}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butCeiling_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_Roof-16.png" />
+			</Button>
+
+			<Button
+				x:Name="butBox"
+				Grid.Row="1"
+				Background="{Binding BoxColor, Converter={StaticResource VectorToBrushConverter}}"
+				Command="{Binding SetBoxCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetBox}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Box}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butBox_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_Box-16.png" />
+			</Button>
+			<Button
+				x:Name="butNotWalkableBox"
+				Grid.Row="1"
+				Grid.Column="1"
+				Background="{Binding NotWalkableColor, Converter={StaticResource VectorToBrushConverter}}"
+				Command="{Binding SetNotWalkableCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetNotWalkable}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.NotWalkableFloor}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butNotWalkableBox_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_NotWalkable-16.png" />
+			</Button>
+
+			<Button
+				x:Name="butMonkey"
+				Grid.Row="2"
+				Background="{Binding MonkeyswingColor, Converter={StaticResource VectorToBrushConverter}}"
+				Command="{Binding SetMonkeyswingCommand}"
+				IsEnabled="{Binding SupportsMonkeySwing}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetMonkeyswing}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Monkey}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butMonkey_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_Monkey-16.png" />
+			</Button>
+			<Button
+				x:Name="butDeath"
+				Grid.Row="2"
+				Grid.Column="1"
+				Background="{Binding DeathColor, Converter={StaticResource VectorToBrushConverter}}"
+				Command="{Binding SetDeathCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetDeath}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Death}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butDeath_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_Death-16.png" />
+			</Button>
+
+			<Button
+				x:Name="butPortal"
+				Grid.Row="3"
+				Background="{Binding PortalColor, Converter={StaticResource VectorToBrushConverter}}"
+				Command="{Binding AddPortalCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize AddPortal}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Portal}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butPortal_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_Portal -16.png" />
+			</Button>
+			<Button
+				x:Name="butWall"
+				Grid.Row="3"
+				Grid.Column="1"
+				Background="{Binding WallColor, Converter={StaticResource VectorToBrushConverter}}"
+				Command="{Binding SetWallCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetWall}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Wall}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butWall_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_Wall_1-16.png" />
+			</Button>
+
+			<Button
+				x:Name="butFlagTriggerTriggerer"
+				Grid.Row="4"
+				Command="{Binding SetTriggerTriggererCommand}"
+				IsEnabled="{Binding SupportsTriggerTriggerer}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetTriggerTriggerer}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.TriggerTriggerer}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butFlagTriggerTriggerer_Image" Source="{Binding TriggerTriggererIcon}" />
+			</Button>
+			<Button
+				x:Name="butFlagBeetle"
+				Grid.Row="4"
+				Grid.Column="1"
+				Command="{Binding SetBeetleCheckpointCommand}"
+				IsEnabled="{Binding SupportsBeetleCheckpoint}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetBeetleCheckpoint}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Beetle}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butFlagBeetle_Image" Source="{Binding BeetleIcon}" />
+			</Button>
+
+			<Button
+				x:Name="butClimbPositiveZ"
+				Grid.Row="5"
+				Command="{Binding SetClimbPositiveZCommand}"
+				IsEnabled="{Binding SupportsClimbing}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetClimbPositiveZ}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Climb}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butClimbPositiveZ_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_ClimbNorth-16.png" />
+			</Button>
+			<Button
+				x:Name="butClimbNegativeZ"
+				Grid.Row="5"
+				Grid.Column="1"
+				Command="{Binding SetClimbNegativeZCommand}"
+				IsEnabled="{Binding SupportsClimbing}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetClimbNegativeZ}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Climb}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butClimbNegativeZ_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_ClimbSouth_1-16.png" />
+			</Button>
+
+			<Button
+				x:Name="butClimbNegativeX"
+				Grid.Row="6"
+				Command="{Binding SetClimbNegativeXCommand}"
+				IsEnabled="{Binding SupportsClimbing}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetClimbNegativeX}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Climb}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butClimbNegativeX_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_ClimbWest-16.png" />
+			</Button>
+			<Button
+				x:Name="butClimbPositiveX"
+				Grid.Row="6"
+				Grid.Column="1"
+				Command="{Binding SetClimbPositiveXCommand}"
+				IsEnabled="{Binding SupportsClimbing}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize SetClimbPositiveX}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Climb}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butClimbPositiveX_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_ClimbEast-16.png" />
+			</Button>
+
+			<Button
+				x:Name="butAddGhostBlock"
+				Grid.Row="7"
+				Command="{Binding AddGhostBlocksToSelectionCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize AddGhostBlocksToSelection}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.Trigger}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butAddGhostBlock_Image" Source="/TombEditor;component/Resources/icons_objects/objects_geometry-override-16.png" />
+			</Button>
+			<Button
+				x:Name="butForceSolidFloor"
+				Grid.Row="7"
+				Grid.Column="1"
+				Command="{Binding ToggleForceFloorSolidCommand}"
+				Style="{DynamicResource ButtonWithIconOnly}"
+				ToolTip="{tombLib:Localize ToggleForceFloorSolid}">
+				<i:Interaction.Triggers>
+					<i:EventTrigger EventName="MouseEnter">
+						<i:InvokeCommandAction Command="{Binding SetSectorColoringInfoPriorityCommand}" CommandParameter="{x:Static rendering:SectorColoringType.ForceFloorSolid}" />
+					</i:EventTrigger>
+				</i:Interaction.Triggers>
+				<Image x:Name="butForceSolidFloor_Image" Source="/TombEditor;component/Resources/icons_sectortype/sectortype_ForceSolidFloor-16 copy.png" />
+			</Button>
+		</controls:SpacedGrid>
+
+		<controls:SpacedGrid
+			Grid.Row="1"
+			Grid.ColumnSpan="2"
+			ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition />
+				<ColumnDefinition />
+			</Grid.ColumnDefinitions>
+
+			<Button Command="{Binding FloorStepCommand}" Style="{DynamicResource ButtonWithIconAndText}">
+				<StackPanel Orientation="Horizontal">
+					<Image Source="/TombEditor;component/Resources/icons_sectortype/sectortype_StepFloor_1-16.png" />
+					<TextBlock Text="{tombLib:Localize FloorStep}" />
+				</StackPanel>
+			</Button>
+			<Button
+				Grid.Column="1"
+				Padding="{x:Static darkUI:Defaults.InputControl_DefaultPadding}"
+				Command="{Binding CeilingStepCommand}"
+				Style="{DynamicResource ButtonWithIconAndText}">
+				<StackPanel Orientation="Horizontal">
+					<Image Source="/TombEditor;component/Resources/icons_sectortype/sectortype_StepCeiling-16.png" />
+					<TextBlock Text="{tombLib:Localize CeilingStep}" />
+				</StackPanel>
+			</Button>
+			<Button
+				Grid.Column="2"
+				Command="{Binding DiagonalWallCommand}"
+				Style="{DynamicResource ButtonWithIconAndText}">
+				<StackPanel Orientation="Horizontal">
+					<Image Source="/TombEditor;component/Resources/icons_sectortype/sectortype_DiagonalWall2-16.png" />
+					<TextBlock Text="{tombLib:Localize DiagonalWall}" />
+				</StackPanel>
+			</Button>
+		</controls:SpacedGrid>
+	</controls:SpacedGrid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsView.xaml.cs b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsView.xaml.cs
new file mode 100644
index 0000000000..b2888bc960
--- /dev/null
+++ b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsView.xaml.cs
@@ -0,0 +1,33 @@
+using System.Windows.Controls;
+
+namespace TombEditor.Features.DockableViews.SectorOptionsPanel;
+
+public partial class SectorOptionsView : UserControl
+{
+	private readonly Editor _editor;
+	private readonly SectorOptionsViewModel _viewModel;
+
+	public SectorOptionsView()
+	{
+		InitializeComponent();
+
+		_editor = Editor.Instance;
+		_viewModel = new SectorOptionsViewModel(_editor);
+		DataContext = _viewModel;
+
+		_editor.EditorEventRaised += EditorEventRaised;
+		Panel2DGridControl.Room = _editor.SelectedRoom;
+	}
+
+	public void Cleanup()
+	{
+		_editor.EditorEventRaised -= EditorEventRaised;
+		_viewModel.Cleanup();
+	}
+
+	private void EditorEventRaised(IEditorEvent obj)
+	{
+		if (obj is Editor.SelectedRoomChangedEvent selectedRoomChangedEvent)
+			Panel2DGridControl.Room = selectedRoomChangedEvent.Current;
+	}
+}
diff --git a/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsViewModel.cs b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsViewModel.cs
new file mode 100644
index 0000000000..2d0df0146c
--- /dev/null
+++ b/TombEditor/Features/DockableViews/SectorOptionsPanel/SectorOptionsViewModel.cs
@@ -0,0 +1,142 @@
+#nullable enable
+
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using System.Numerics;
+using System.Windows.Input;
+using TombLib.LevelData;
+using TombLib.Rendering;
+using TombLib.WPF;
+
+namespace TombEditor.Features.DockableViews.SectorOptionsPanel;
+
+public partial class SectorOptionsViewModel : ObservableObject
+{
+	[ObservableProperty] private Vector4 floorColor;
+	[ObservableProperty] private Vector4 boxColor;
+	[ObservableProperty] private Vector4 notWalkableColor;
+	[ObservableProperty] private Vector4 monkeyswingColor;
+	[ObservableProperty] private Vector4 deathColor;
+	[ObservableProperty] private Vector4 portalColor;
+	[ObservableProperty] private Vector4 wallColor;
+
+	[ObservableProperty] private bool supportsClimbing;
+	[ObservableProperty] private bool supportsMonkeySwing;
+	[ObservableProperty] private bool supportsBeetleCheckpoint;
+	[ObservableProperty] private bool supportsTriggerTriggerer;
+
+	[ObservableProperty] private string triggerTriggererIcon = TriggerTriggererIconTR4;
+	[ObservableProperty] private string beetleIcon = BeetleIconTR4;
+
+	private const string TriggerTriggererIconTR4 = "/TombEditor;component/Resources/icons_sectortype/sectortype_TriggerTriggerer-16.png";
+	private const string TriggerTriggererIconTR3 = "/TombEditor;component/Resources/icons_sectortype/sectortype_MinecartLeft-16.png";
+	private const string BeetleIconTR4 = "/TombEditor;component/Resources/icons_sectortype/sectortype_Beetle-16.png";
+	private const string BeetleIconTR3 = "/TombEditor;component/Resources/icons_sectortype/sectortype_MinecartRight-16.png";
+
+	public ICommand SetFloorCommand { get; }
+	public ICommand SetCeilingCommand { get; }
+	public ICommand SetBoxCommand { get; }
+	public ICommand SetNotWalkableCommand { get; }
+	public ICommand SetMonkeyswingCommand { get; }
+	public ICommand SetDeathCommand { get; }
+	public ICommand AddPortalCommand { get; }
+	public ICommand SetWallCommand { get; }
+	public ICommand SetTriggerTriggererCommand { get; }
+	public ICommand SetBeetleCheckpointCommand { get; }
+	public ICommand SetClimbPositiveZCommand { get; }
+	public ICommand SetClimbPositiveXCommand { get; }
+	public ICommand SetClimbNegativeZCommand { get; }
+	public ICommand SetClimbNegativeXCommand { get; }
+	public ICommand AddGhostBlocksToSelectionCommand { get; }
+	public ICommand ToggleForceFloorSolidCommand { get; }
+	public ICommand FloorStepCommand { get; }
+	public ICommand CeilingStepCommand { get; }
+	public ICommand DiagonalWallCommand { get; }
+
+	private readonly Editor _editor;
+
+	public SectorOptionsViewModel(Editor editor)
+	{
+		_editor = editor;
+		_editor.EditorEventRaised += EditorEventRaised;
+
+		SetFloorCommand = CommandHandler.GetCommand("SetFloor", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetCeilingCommand = CommandHandler.GetCommand("SetCeiling", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetBoxCommand = CommandHandler.GetCommand("SetBox", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetNotWalkableCommand = CommandHandler.GetCommand("SetNotWalkable", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetMonkeyswingCommand = CommandHandler.GetCommand("SetMonkeyswing", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetDeathCommand = CommandHandler.GetCommand("SetDeath", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		AddPortalCommand = CommandHandler.GetCommand("AddPortal", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetWallCommand = CommandHandler.GetCommand("SetWall", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetTriggerTriggererCommand = CommandHandler.GetCommand("SetTriggerTriggerer", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetBeetleCheckpointCommand = CommandHandler.GetCommand("SetBeetleCheckpoint", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetClimbPositiveZCommand = CommandHandler.GetCommand("SetClimbPositiveZ", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetClimbPositiveXCommand = CommandHandler.GetCommand("SetClimbPositiveX", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetClimbNegativeZCommand = CommandHandler.GetCommand("SetClimbNegativeZ", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		SetClimbNegativeXCommand = CommandHandler.GetCommand("SetClimbNegativeX", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		AddGhostBlocksToSelectionCommand = CommandHandler.GetCommand("AddGhostBlocksToSelection", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		ToggleForceFloorSolidCommand = CommandHandler.GetCommand("ToggleForceFloorSolid", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		FloorStepCommand = CommandHandler.GetCommand("SetDiagonalFloorStep", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		CeilingStepCommand = CommandHandler.GetCommand("SetDiagonalCeilingStep", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+		DiagonalWallCommand = CommandHandler.GetCommand("SetDiagonalWall", new CommandArgs(WPFUtils.GetWin32WindowFromCaller(this), _editor));
+
+		SetButtonColors();
+		UpdateVersionSpecificControls();
+	}
+
+	public void Cleanup()
+	{
+		_editor.EditorEventRaised -= EditorEventRaised;
+	}
+
+	private void EditorEventRaised(IEditorEvent obj)
+	{
+		if (obj is Editor.ConfigurationChangedEvent or Editor.InitEvent)
+			SetButtonColors();
+
+		if (obj is Editor.InitEvent or Editor.GameVersionChangedEvent or Editor.LevelChangedEvent)
+			UpdateVersionSpecificControls();
+	}
+
+	private void SetButtonColors()
+	{
+		FloorColor = _editor.Configuration.UI_ColorScheme.ColorFloor;
+		BoxColor = _editor.Configuration.UI_ColorScheme.ColorBox;
+		NotWalkableColor = _editor.Configuration.UI_ColorScheme.ColorNotWalkable;
+		MonkeyswingColor = _editor.Configuration.UI_ColorScheme.ColorMonkey;
+		DeathColor = _editor.Configuration.UI_ColorScheme.ColorDeath;
+		PortalColor = _editor.Configuration.UI_ColorScheme.ColorPortal;
+		WallColor = _editor.Configuration.UI_ColorScheme.ColorWall;
+	}
+
+	private void UpdateVersionSpecificControls()
+	{
+		var version = _editor.Level.Settings.GameVersion;
+		bool isTR345 = version.Native() >= TRVersion.Game.TR3;
+
+		SupportsClimbing = version.SupportsClimbing();
+		SupportsMonkeySwing = version.SupportsMonkeySwing();
+		SupportsBeetleCheckpoint = isTR345;
+		SupportsTriggerTriggerer = isTR345;
+
+		if (version.Native() >= TRVersion.Game.TR4)
+		{
+			TriggerTriggererIcon = TriggerTriggererIconTR4;
+			BeetleIcon = BeetleIconTR4;
+		}
+		else
+		{
+			TriggerTriggererIcon = TriggerTriggererIconTR3;
+			BeetleIcon = BeetleIconTR3;
+		}
+	}
+
+	[RelayCommand]
+	private void SetSectorColoringInfoPriority(SectorColoringType type)
+	{
+		if (!_editor.Configuration.UI_AutoSwitchSectorColoringInfo)
+			return;
+
+		_editor.SectorColoringManager.SetPriority(type);
+	}
+}
diff --git a/TombEditor/ToolWindows/TexturePanel.Designer.cs b/TombEditor/Features/DockableViews/TexturePanel/TexturePanel.Designer.cs
similarity index 99%
rename from TombEditor/ToolWindows/TexturePanel.Designer.cs
rename to TombEditor/Features/DockableViews/TexturePanel/TexturePanel.Designer.cs
index 261b408b89..dc06dcee3a 100644
--- a/TombEditor/ToolWindows/TexturePanel.Designer.cs
+++ b/TombEditor/Features/DockableViews/TexturePanel/TexturePanel.Designer.cs
@@ -1,6 +1,6 @@
 using TombEditor.Controls;
 
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.TexturePanel
 {
     partial class TexturePanel
     {
diff --git a/TombEditor/ToolWindows/TexturePanel.cs b/TombEditor/Features/DockableViews/TexturePanel/TexturePanel.cs
similarity index 99%
rename from TombEditor/ToolWindows/TexturePanel.cs
rename to TombEditor/Features/DockableViews/TexturePanel/TexturePanel.cs
index 2c7a5f8ba3..64e4549252 100644
--- a/TombEditor/ToolWindows/TexturePanel.cs
+++ b/TombEditor/Features/DockableViews/TexturePanel/TexturePanel.cs
@@ -10,7 +10,7 @@
 using TombLib.LevelData;
 using TombLib.Utils;
 
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.TexturePanel
 {
 	public partial class TexturePanel : DarkToolWindow
 	{
@@ -140,7 +140,7 @@ private void UpdateUI()
 			butAnimationRanges.Enabled =
 			butMaterialEditor.Enabled = comboCurrentTexture.SelectedItem != null;
 
-            butTextureSounds.Enabled = comboCurrentTexture.SelectedItem != null && 
+            butTextureSounds.Enabled = comboCurrentTexture.SelectedItem != null &&
                 _editor.Level.Settings.GameVersion.Native() >= TRVersion.Game.TR3;
 
             butBumpMaps.Enabled = comboCurrentTexture.SelectedItem != null &&
diff --git a/TombEditor/ToolWindows/TexturePanel.resx b/TombEditor/Features/DockableViews/TexturePanel/TexturePanel.resx
similarity index 100%
rename from TombEditor/ToolWindows/TexturePanel.resx
rename to TombEditor/Features/DockableViews/TexturePanel/TexturePanel.resx
diff --git a/TombEditor/Features/DockableViews/TexturePanel/TexturePanelView.xaml b/TombEditor/Features/DockableViews/TexturePanel/TexturePanelView.xaml
new file mode 100644
index 0000000000..17e907afaa
--- /dev/null
+++ b/TombEditor/Features/DockableViews/TexturePanel/TexturePanelView.xaml
@@ -0,0 +1,97 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.TexturePanel.TexturePanelView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
+	MinWidth="286"
+	MinHeight="100"
+	d:DesignHeight="600"
+	d:DesignWidth="286"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<controls:SpacedGrid Margin="{x:Static darkUI:Defaults.SmallThickness}" RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<controls:SpacedGrid Grid.Row="0" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
+
+			<controls:SearchableComboBox />
+
+			<Button Grid.Column="1" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_plus_math-16.png" />
+			</Button>
+
+			<Button Grid.Column="2" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_actions/actions_refresh-16.png" />
+			</Button>
+
+			<Button Grid.Column="3" Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_trash-16.png" />
+			</Button>
+		</controls:SpacedGrid>
+
+		<WindowsFormsHost x:Name="ViewportHost" Grid.Row="1" />
+
+		<controls:SpacedGrid Grid.Row="2" RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Grid.RowDefinitions>
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+				<RowDefinition Height="Auto" />
+			</Grid.RowDefinitions>
+
+			<controls:SpacedGrid Grid.Row="0" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition />
+				</Grid.ColumnDefinitions>
+
+				<Button Grid.Column="0" Style="{DynamicResource ButtonWithIconOnly}">
+					<Image Source="/TombEditor;component/Resources/icons_texture/texture_DoubleSided_1-16.png" />
+				</Button>
+
+				<ComboBox Grid.Column="1" />
+
+				<Button Grid.Column="2" Style="{DynamicResource ButtonWithIconOnly}">
+					<Image Source="/TombEditor;component/Resources/icons_texture/texture_Rotate.png" />
+				</Button>
+				<Button Grid.Column="3" Style="{DynamicResource ButtonWithIconOnly}">
+					<Image Source="/TombEditor;component/Resources/icons_texture/texture_mirror.png" />
+				</Button>
+
+				<ComboBox Grid.Column="4" />
+			</controls:SpacedGrid>
+
+			<controls:SpacedGrid Grid.Row="1" ColumnSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition />
+					<ColumnDefinition />
+					<ColumnDefinition />
+				</Grid.ColumnDefinitions>
+
+				<Button Grid.Column="0" Content="{tombLib:Localize Animations}" />
+				<Button Grid.Column="1" Content="{tombLib:Localize Sounds}" />
+				<Button Grid.Column="2" Content="{tombLib:Localize Bumpmaps}" />
+			</controls:SpacedGrid>
+
+			<Button Grid.Row="2" Content="{tombLib:Localize Materials}" />
+		</controls:SpacedGrid>
+	</controls:SpacedGrid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/TexturePanel/TexturePanelView.xaml.cs b/TombEditor/Features/DockableViews/TexturePanel/TexturePanelView.xaml.cs
new file mode 100644
index 0000000000..c57f00940f
--- /dev/null
+++ b/TombEditor/Features/DockableViews/TexturePanel/TexturePanelView.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace TombEditor.Features.DockableViews.TexturePanel;
+
+public partial class TexturePanelView : UserControl
+{
+	public TexturePanelView()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/TombEditor/ToolWindows/TriggerList.Designer.cs b/TombEditor/Features/DockableViews/TriggerList/TriggerList.Designer.cs
similarity index 99%
rename from TombEditor/ToolWindows/TriggerList.Designer.cs
rename to TombEditor/Features/DockableViews/TriggerList/TriggerList.Designer.cs
index 918d1be460..daee8ad912 100644
--- a/TombEditor/ToolWindows/TriggerList.Designer.cs
+++ b/TombEditor/Features/DockableViews/TriggerList/TriggerList.Designer.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.TriggerList
 {
     partial class TriggerList
     {
diff --git a/TombEditor/ToolWindows/TriggerList.cs b/TombEditor/Features/DockableViews/TriggerList/TriggerList.cs
similarity index 99%
rename from TombEditor/ToolWindows/TriggerList.cs
rename to TombEditor/Features/DockableViews/TriggerList/TriggerList.cs
index 84bd6a2061..8ab8ab12ad 100644
--- a/TombEditor/ToolWindows/TriggerList.cs
+++ b/TombEditor/Features/DockableViews/TriggerList/TriggerList.cs
@@ -10,7 +10,7 @@
 using TombLib.LevelData;
 using TombLib.Rendering;
 
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.DockableViews.TriggerList
 {
     public partial class TriggerList : DarkToolWindow
     {
diff --git a/TombEditor/ToolWindows/TriggerList.resx b/TombEditor/Features/DockableViews/TriggerList/TriggerList.resx
similarity index 100%
rename from TombEditor/ToolWindows/TriggerList.resx
rename to TombEditor/Features/DockableViews/TriggerList/TriggerList.resx
diff --git a/TombEditor/Features/DockableViews/TriggerList/TriggerListView.xaml b/TombEditor/Features/DockableViews/TriggerList/TriggerListView.xaml
new file mode 100644
index 0000000000..68d7ebfa09
--- /dev/null
+++ b/TombEditor/Features/DockableViews/TriggerList/TriggerListView.xaml
@@ -0,0 +1,40 @@
+<UserControl
+	x:Class="TombEditor.Features.DockableViews.TriggerList.TriggerListView"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	d:DesignHeight="175"
+	d:DesignWidth="285"
+	Background="{DynamicResource Brush_Background}"
+	RenderOptions.BitmapScalingMode="NearestNeighbor"
+	mc:Ignorable="d">
+
+	<controls:SpacedGrid Margin="{x:Static darkUI:Defaults.SmallThickness}" RowSpacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+		<Grid.RowDefinitions>
+			<RowDefinition />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<WindowsFormsHost x:Name="TreeViewHost" />
+
+		<controls:SpacedStack
+			Grid.Row="1"
+			Orientation="Horizontal"
+			Spacing="{x:Static darkUI:Defaults.SmallThicknessWidth}">
+			<Button Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_plus_math-16.png" />
+			</Button>
+
+			<Button Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_edit-16.png" />
+			</Button>
+
+			<Button Style="{DynamicResource ButtonWithIconOnly}">
+				<Image Source="/TombEditor;component/Resources/icons_general/general_trash-16.png" />
+			</Button>
+		</controls:SpacedStack>
+	</controls:SpacedGrid>
+</UserControl>
diff --git a/TombEditor/Features/DockableViews/TriggerList/TriggerListView.xaml.cs b/TombEditor/Features/DockableViews/TriggerList/TriggerListView.xaml.cs
new file mode 100644
index 0000000000..6fda3d3b9b
--- /dev/null
+++ b/TombEditor/Features/DockableViews/TriggerList/TriggerListView.xaml.cs
@@ -0,0 +1,11 @@
+using System.Windows.Controls;
+
+namespace TombEditor.Features.DockableViews.TriggerList;
+
+public partial class TriggerListView : UserControl
+{
+	public TriggerListView()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/TombEditor/Controls/FlybyTimeline/FlybyConstants.cs b/TombEditor/Features/FlybyTimeline/FlybyConstants.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/FlybyConstants.cs
rename to TombEditor/Features/FlybyTimeline/FlybyConstants.cs
index d6f174a1e6..239d84e190 100644
--- a/TombEditor/Controls/FlybyTimeline/FlybyConstants.cs
+++ b/TombEditor/Features/FlybyTimeline/FlybyConstants.cs
@@ -1,6 +1,6 @@
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline;
+namespace TombEditor.Features.FlybyTimeline;
 
 public static class FlybyConstants
 {
diff --git a/TombEditor/Controls/FlybyTimeline/Preview/FlybyFrameState.cs b/TombEditor/Features/FlybyTimeline/Preview/FlybyFrameState.cs
similarity index 94%
rename from TombEditor/Controls/FlybyTimeline/Preview/FlybyFrameState.cs
rename to TombEditor/Features/FlybyTimeline/Preview/FlybyFrameState.cs
index 3873a14243..dadc98b79b 100644
--- a/TombEditor/Controls/FlybyTimeline/Preview/FlybyFrameState.cs
+++ b/TombEditor/Features/FlybyTimeline/Preview/FlybyFrameState.cs
@@ -3,7 +3,7 @@
 using System.Numerics;
 using TombLib;
 
-namespace TombEditor.Controls.FlybyTimeline.Preview;
+namespace TombEditor.Features.FlybyTimeline.Preview;
 
 /// <summary>
 /// Stores the camera state for a single flyby frame. Used both as the internal cache
diff --git a/TombEditor/Controls/FlybyTimeline/Preview/FlybyPreview.cs b/TombEditor/Features/FlybyTimeline/Preview/FlybyPreview.cs
similarity index 98%
rename from TombEditor/Controls/FlybyTimeline/Preview/FlybyPreview.cs
rename to TombEditor/Features/FlybyTimeline/Preview/FlybyPreview.cs
index d29197149f..0dad623ea9 100644
--- a/TombEditor/Controls/FlybyTimeline/Preview/FlybyPreview.cs
+++ b/TombEditor/Features/FlybyTimeline/Preview/FlybyPreview.cs
@@ -3,12 +3,12 @@
 using System;
 using System.Diagnostics;
 using System.Numerics;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib;
 using TombLib.Graphics;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.Preview;
+namespace TombEditor.Features.FlybyTimeline.Preview;
 
 /// <summary>
 /// Handles camera preview for flyby sequences. All frame interpolation is backed
diff --git a/TombEditor/Controls/FlybyTimeline/Preview/FlybyPreviewController.cs b/TombEditor/Features/FlybyTimeline/Preview/FlybyPreviewController.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/Preview/FlybyPreviewController.cs
rename to TombEditor/Features/FlybyTimeline/Preview/FlybyPreviewController.cs
index 28d3782e0a..09a85a5e07 100644
--- a/TombEditor/Controls/FlybyTimeline/Preview/FlybyPreviewController.cs
+++ b/TombEditor/Features/FlybyTimeline/Preview/FlybyPreviewController.cs
@@ -4,11 +4,11 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Threading;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib.Forms;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.Preview;
+namespace TombEditor.Features.FlybyTimeline.Preview;
 
 /// <summary>
 /// Manages flyby camera preview and playback lifecycle.
diff --git a/TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceCache.cs b/TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceCache.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceCache.cs
rename to TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceCache.cs
index 5f0986af02..9257dd6c2f 100644
--- a/TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceCache.cs
+++ b/TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceCache.cs
@@ -4,12 +4,12 @@
 using System.Collections.Generic;
 using System.Numerics;
 using System.Threading.Tasks;
-using TombEditor.Controls.FlybyTimeline.Preview;
+using TombEditor.Features.FlybyTimeline.Preview;
 using TombLib;
 using TombLib.LevelData;
 using TombLib.Utils;
 
-namespace TombEditor.Controls.FlybyTimeline.Sequence;
+namespace TombEditor.Features.FlybyTimeline.Sequence;
 
 /// <summary>
 /// <para>
diff --git a/TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceHelper.cs b/TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceHelper.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceHelper.cs
rename to TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceHelper.cs
index 533793efa1..93a4b8a620 100644
--- a/TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceHelper.cs
+++ b/TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceHelper.cs
@@ -8,7 +8,7 @@
 using TombLib.Graphics;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.Sequence;
+namespace TombEditor.Features.FlybyTimeline.Sequence;
 
 /// <summary>
 /// Static helpers for flyby sequence discovery, formatting, flag access, and editor-camera conversions.
diff --git a/TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceTiming.cs b/TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceTiming.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceTiming.cs
rename to TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceTiming.cs
index b2d250117e..9dbd79d30f 100644
--- a/TombEditor/Controls/FlybyTimeline/Sequence/FlybySequenceTiming.cs
+++ b/TombEditor/Features/FlybyTimeline/Sequence/FlybySequenceTiming.cs
@@ -6,7 +6,7 @@
 using TombLib.LevelData;
 using TombLib.Utils;
 
-namespace TombEditor.Controls.FlybyTimeline.Sequence;
+namespace TombEditor.Features.FlybyTimeline.Sequence;
 
 /// <summary>
 /// Represents one cut interval in the generated playback timeline.
diff --git a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Input.cs b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Input.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Input.cs
rename to TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Input.cs
index f7991d4334..b94c8afdb0 100644
--- a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Input.cs
+++ b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Input.cs
@@ -5,7 +5,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace TombEditor.Controls.FlybyTimeline.UI;
+namespace TombEditor.Features.FlybyTimeline.UI;
 
 // Mouse and keyboard input handling for the timeline control.
 public partial class FlybyTimelineControl
diff --git a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Rendering.cs b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Rendering.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Rendering.cs
rename to TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Rendering.cs
index e712016a75..272e38ffd4 100644
--- a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Rendering.cs
+++ b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Rendering.cs
@@ -1,13 +1,12 @@
 #nullable enable
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Media;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 
-namespace TombEditor.Controls.FlybyTimeline.UI;
+namespace TombEditor.Features.FlybyTimeline.UI;
 
 // WPF OnRender drawing for ruler, track, markers, and playhead.
 public partial class FlybyTimelineControl
diff --git a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Viewport.cs b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Viewport.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Viewport.cs
rename to TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Viewport.cs
index c62dea178a..865770d577 100644
--- a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.Viewport.cs
+++ b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.Viewport.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Windows;
 
-namespace TombEditor.Controls.FlybyTimeline.UI;
+namespace TombEditor.Features.FlybyTimeline.UI;
 
 // Coordinate conversion, scrolling, zooming, and smooth viewport animation.
 public partial class FlybyTimelineControl
diff --git a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.cs b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.cs
similarity index 98%
rename from TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.cs
rename to TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.cs
index ef4146d661..b6bfc89b00 100644
--- a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineControl.cs
+++ b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineControl.cs
@@ -6,10 +6,10 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Threading;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib.WPF;
 
-namespace TombEditor.Controls.FlybyTimeline.UI;
+namespace TombEditor.Features.FlybyTimeline.UI;
 
 /// <summary>
 /// A custom WPF timeline control that displays draggable camera keyframes.
diff --git a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineMarker.cs b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineMarker.cs
similarity index 96%
rename from TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineMarker.cs
rename to TombEditor/Features/FlybyTimeline/UI/FlybyTimelineMarker.cs
index 3763f5cc32..2d541d9ddb 100644
--- a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineMarker.cs
+++ b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineMarker.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.Controls.FlybyTimeline.UI;
+namespace TombEditor.Features.FlybyTimeline.UI;
 
 /// <summary>
 /// Represents one rendered marker on the timeline.
diff --git a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineRenderState.cs b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineRenderState.cs
similarity index 89%
rename from TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineRenderState.cs
rename to TombEditor/Features/FlybyTimeline/UI/FlybyTimelineRenderState.cs
index a4fae172bc..3d1b27443b 100644
--- a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineRenderState.cs
+++ b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineRenderState.cs
@@ -1,9 +1,9 @@
 #nullable enable
 
 using System.Collections.Generic;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 
-namespace TombEditor.Controls.FlybyTimeline.UI;
+namespace TombEditor.Features.FlybyTimeline.UI;
 
 /// <summary>
 /// Represents the data required to render the current timeline state.
diff --git a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineView.xaml b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineView.xaml
similarity index 97%
rename from TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineView.xaml
rename to TombEditor/Features/FlybyTimeline/UI/FlybyTimelineView.xaml
index cc88e33543..a89aa46c93 100644
--- a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineView.xaml
+++ b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineView.xaml
@@ -1,11 +1,11 @@
 <UserControl
-    x:Class="TombEditor.Controls.FlybyTimeline.UI.FlybyTimelineView"
+    x:Class="TombEditor.Features.FlybyTimeline.UI.FlybyTimelineView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
-    xmlns:local="clr-namespace:TombEditor.Controls.FlybyTimeline.UI"
+    xmlns:local="clr-namespace:TombEditor.Features.FlybyTimeline.UI"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
     d:DesignHeight="80"
diff --git a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineView.xaml.cs b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineView.xaml.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineView.xaml.cs
rename to TombEditor/Features/FlybyTimeline/UI/FlybyTimelineView.xaml.cs
index ca93bf8988..7bfaf1ae1f 100644
--- a/TombEditor/Controls/FlybyTimeline/UI/FlybyTimelineView.xaml.cs
+++ b/TombEditor/Features/FlybyTimeline/UI/FlybyTimelineView.xaml.cs
@@ -5,9 +5,9 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Controls;
 using System.Windows.Threading;
-using TombEditor.Controls.FlybyTimeline.ViewModel;
+using TombEditor.Features.FlybyTimeline.ViewModel;
 
-namespace TombEditor.Controls.FlybyTimeline.UI;
+namespace TombEditor.Features.FlybyTimeline.UI;
 
 /// <summary>
 /// WPF UserControl that embeds the flyby timeline and its controls.
diff --git a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyCameraItemViewModel.cs b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyCameraItemViewModel.cs
similarity index 95%
rename from TombEditor/Controls/FlybyTimeline/ViewModel/FlybyCameraItemViewModel.cs
rename to TombEditor/Features/FlybyTimeline/ViewModel/FlybyCameraItemViewModel.cs
index 60af2b27c1..d6a865d5f6 100644
--- a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyCameraItemViewModel.cs
+++ b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyCameraItemViewModel.cs
@@ -3,7 +3,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.ViewModel;
+namespace TombEditor.Features.FlybyTimeline.ViewModel;
 
 /// <summary>
 /// View model for a single flyby camera entry in the camera list.
diff --git a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Cache.cs b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Cache.cs
similarity index 98%
rename from TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Cache.cs
rename to TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Cache.cs
index 985cbd9e32..af797d7766 100644
--- a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Cache.cs
+++ b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Cache.cs
@@ -5,10 +5,10 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Windows.Threading;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.ViewModel;
+namespace TombEditor.Features.FlybyTimeline.ViewModel;
 
 // Timing cache, sequence cache, and camera snapshot helpers.
 public partial class FlybyTimelineViewModel
diff --git a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Properties.cs b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Properties.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Properties.cs
rename to TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Properties.cs
index 352c076385..1ed23f5259 100644
--- a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Properties.cs
+++ b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Properties.cs
@@ -3,7 +3,7 @@
 using System;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.ViewModel;
+namespace TombEditor.Features.FlybyTimeline.ViewModel;
 
 // Camera property editing with undo support.
 public partial class FlybyTimelineViewModel
diff --git a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Refresh.cs b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Refresh.cs
similarity index 98%
rename from TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Refresh.cs
rename to TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Refresh.cs
index bcfeb6d848..23fc6ba170 100644
--- a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Refresh.cs
+++ b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Refresh.cs
@@ -4,10 +4,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.ViewModel;
+namespace TombEditor.Features.FlybyTimeline.ViewModel;
 
 // Data refresh, camera list rebuilding, and renumbering.
 public partial class FlybyTimelineViewModel
diff --git a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Selection.cs b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Selection.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Selection.cs
rename to TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Selection.cs
index 4c2a6d4c84..a5d640e71a 100644
--- a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Selection.cs
+++ b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Selection.cs
@@ -5,7 +5,7 @@
 using TombLib.LevelData;
 using TombLib.Utils;
 
-namespace TombEditor.Controls.FlybyTimeline.ViewModel;
+namespace TombEditor.Features.FlybyTimeline.ViewModel;
 
 // Editor event handling and camera selection synchronization.
 public partial class FlybyTimelineViewModel
diff --git a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Sequence.cs b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Sequence.cs
similarity index 99%
rename from TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Sequence.cs
rename to TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Sequence.cs
index 17083adfa4..157601f1c7 100644
--- a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Sequence.cs
+++ b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Sequence.cs
@@ -4,11 +4,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib.Forms;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.ViewModel;
+namespace TombEditor.Features.FlybyTimeline.ViewModel;
 
 // Sequence and camera CRUD operations (add, delete, duplicate, move).
 public partial class FlybyTimelineViewModel
diff --git a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Timeline.cs b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Timeline.cs
similarity index 98%
rename from TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Timeline.cs
rename to TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Timeline.cs
index 73897f0998..01bde1f6ca 100644
--- a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Timeline.cs
+++ b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.Timeline.cs
@@ -4,13 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.Numerics;
-using TombEditor.Controls.FlybyTimeline.Sequence;
-using TombEditor.Controls.FlybyTimeline.UI;
+using TombEditor.Features.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.UI;
 using TombLib;
 using TombLib.Forms;
 using TombLib.LevelData;
 
-namespace TombEditor.Controls.FlybyTimeline.ViewModel;
+namespace TombEditor.Features.FlybyTimeline.ViewModel;
 
 // Preview playback, timeline scrubbing, and timecode calculation.
 public partial class FlybyTimelineViewModel
diff --git a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.cs b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.cs
similarity index 98%
rename from TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.cs
rename to TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.cs
index 34746e525d..aef9a16a17 100644
--- a/TombEditor/Controls/FlybyTimeline/ViewModel/FlybyTimelineViewModel.cs
+++ b/TombEditor/Features/FlybyTimeline/ViewModel/FlybyTimelineViewModel.cs
@@ -6,13 +6,13 @@
 using System.Collections.ObjectModel;
 using System.Windows.Forms;
 using System.Windows.Threading;
-using TombEditor.Controls.FlybyTimeline.Preview;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Preview;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib.LevelData;
 using TombLib.WPF.Services;
 using TombLib.WPF.Services.Abstract;
 
-namespace TombEditor.Controls.FlybyTimeline.ViewModel;
+namespace TombEditor.Features.FlybyTimeline.ViewModel;
 
 /// <summary>
 /// Main view model for the Flyby Sequence Manager window.
diff --git a/TombEditor/Controls/ObjectBrush/ObjectBrushActions.cs b/TombEditor/Features/Panel3D/ObjectBrush/Actions.cs
similarity index 87%
rename from TombEditor/Controls/ObjectBrush/ObjectBrushActions.cs
rename to TombEditor/Features/Panel3D/ObjectBrush/Actions.cs
index b2ae942178..8f4fcb513f 100644
--- a/TombEditor/Controls/ObjectBrush/ObjectBrushActions.cs
+++ b/TombEditor/Features/Panel3D/ObjectBrush/Actions.cs
@@ -6,7 +6,7 @@
 using TombLib.LevelData;
 using TombLib.Utils;
 
-namespace TombEditor.Controls.ObjectBrush
+namespace TombEditor.Features.Panel3D.ObjectBrush
 {
     public static class Actions
     {
@@ -39,27 +39,27 @@ private static void ExecuteBrushAction(Editor editor, Room room, float localX, f
             switch (editor.Tool.Tool)
             {
                 case EditorToolType.Brush:
-                    var placed = Helper.PlaceObjectsWithBrush(editor, room, localX, localZ, sectorConstraint);
+                    var placed = Helpers.PlaceObjectsWithBrush(editor, room, localX, localZ, sectorConstraint);
                     _strokeUndoList.AddRange(placed.Select(o => new AddRemoveObjectUndoInstance(editor.UndoManager, o, true)));
                     _strokePlacedObjects.AddRange(placed);
                     break;
 
                 case EditorToolType.Eraser:
-                    var removed = Helper.EraseObjectsWithBrush(editor, room, localX, localZ, sectorConstraint);
+                    var removed = Helpers.EraseObjectsWithBrush(editor, room, localX, localZ, sectorConstraint);
                     _strokeUndoList.AddRange(removed.Select(r => new AddRemoveObjectUndoInstance(editor.UndoManager, r.Obj, false, r.Room)));
                     break;
 
                 case EditorToolType.ObjectSelection:
-                    Helper.SelectObjectsWithBrush(editor, room, localX, localZ, sectorConstraint, _strokeProcessedObjects);
+                    Helpers.SelectObjectsWithBrush(editor, room, localX, localZ, sectorConstraint, _strokeProcessedObjects);
                     break;
 
                 case EditorToolType.ObjectDeselection:
-                    Helper.SelectObjectsWithBrush(editor, room, localX, localZ, sectorConstraint, _strokeProcessedObjects, deselect: true);
+                    Helpers.SelectObjectsWithBrush(editor, room, localX, localZ, sectorConstraint, _strokeProcessedObjects, deselect: true);
                     break;
 
                 case EditorToolType.Pencil:
                 case EditorToolType.Line:
-                    var pencilPlaced = Helper.PlaceObjectWithPencil(editor, room, localX, localZ, ref _pencilItemIndex,
+                    var pencilPlaced = Helpers.PlaceObjectWithPencil(editor, room, localX, localZ, ref _pencilItemIndex,
                         sectorConstraint, skipOverlapCheck: editor.Tool.Tool == EditorToolType.Line);
                     _strokeUndoList.AddRange(pencilPlaced.Select(o => new AddRemoveObjectUndoInstance(editor.UndoManager, o, true)));
                     _strokePlacedObjects.AddRange(pencilPlaced);
@@ -117,10 +117,10 @@ public static void ExecuteFill(Editor editor, Room selectedRoom)
                 return;
 
             var sectorConstraint = editor.SelectedSectors.Valid && !editor.SelectedSectors.Empty
-                ? (RectangleInt2?)editor.SelectedSectors.Area
+                ? editor.SelectedSectors.Area
                 : (RectangleInt2?)new RectangleInt2(1, 1, selectedRoom.NumXSectors - 2, selectedRoom.NumZSectors - 2);
 
-            var placed = Helper.FillAreaWithObjects(editor, selectedRoom, editor.ChosenItems, sectorConstraint.Value);
+            var placed = Helpers.FillAreaWithObjects(editor, selectedRoom, editor.ChosenItems, sectorConstraint.Value);
             if (placed.Count == 0)
                 return;
 
diff --git a/TombEditor/Features/Panel3D/ObjectBrush/Constants.cs b/TombEditor/Features/Panel3D/ObjectBrush/Constants.cs
new file mode 100644
index 0000000000..463523f04d
--- /dev/null
+++ b/TombEditor/Features/Panel3D/ObjectBrush/Constants.cs
@@ -0,0 +1,13 @@
+namespace TombEditor.Features.Panel3D.ObjectBrush;
+
+internal static class Constants
+{
+	public const float RadiusAdjustmentStep = 64.0f;
+	public const float AngleAdjustmentStep = 5.0f;
+	public const float ParamDeadzone = 30;
+
+	public const float MinRadius = 0.1f;
+	public const float MaxRadius = 20.0f;
+	public const float MinDensity = 0.01f;
+	public const float MaxDensity = 10.0f;
+}
diff --git a/TombEditor/Controls/ObjectBrush/ObjectBrushHelper.cs b/TombEditor/Features/Panel3D/ObjectBrush/Helper.cs
similarity index 98%
rename from TombEditor/Controls/ObjectBrush/ObjectBrushHelper.cs
rename to TombEditor/Features/Panel3D/ObjectBrush/Helper.cs
index a206c45d06..1a2adfd3ea 100644
--- a/TombEditor/Controls/ObjectBrush/ObjectBrushHelper.cs
+++ b/TombEditor/Features/Panel3D/ObjectBrush/Helper.cs
@@ -7,9 +7,9 @@
 using TombLib.LevelData;
 using TombLib.Wad;
 
-namespace TombEditor.Controls.ObjectBrush
+namespace TombEditor.Features.Panel3D.ObjectBrush
 {
-    public static class Helper
+    public static class Helpers
     {
         private static readonly Random _rng = new Random();
 
@@ -240,7 +240,7 @@ public static bool IsInBrushArea(float x, float z, float centerX, float centerZ,
             float dz = z - centerZ;
 
             if (shape == ObjectBrushShape.Circle)
-                return (dx * dx + dz * dz) <= (radius * radius);
+                return dx * dx + dz * dz <= radius * radius;
             else
                 return Math.Abs(dx) <= radius && Math.Abs(dz) <= radius;
         }
@@ -300,7 +300,7 @@ private static int CountMatchingObjectsInArea(List<Vector2> positions, float cen
         public static int GetTargetObjectCount(float radius, float density, ObjectBrushShape shape)
         {
             float radiusSectors = radius / Level.SectorSizeUnit;
-            float area = shape == ObjectBrushShape.Circle ? (float)(Math.PI * radiusSectors * radiusSectors) : (2 * radiusSectors) * (2 * radiusSectors);
+            float area = shape == ObjectBrushShape.Circle ? (float)(Math.PI * radiusSectors * radiusSectors) : 2 * radiusSectors * (2 * radiusSectors);
             return Math.Max(1, (int)Math.Round(area * density));
         }
 
@@ -511,7 +511,7 @@ private static bool TryPlaceObject(Editor editor, Level level, Room targetRoom,
                 if (randomRot)
                     rotY += ((float)_rng.NextDouble() - 0.5f) * 45.0f;
 
-                rotY = ((rotY % 360.0f) + 360.0f) % 360.0f;
+                rotY = (rotY % 360.0f + 360.0f) % 360.0f;
             }
             else if (randomRot)
             {
@@ -664,8 +664,8 @@ private static List<PositionBasedObjectInstance> CollectObjectsInBrushArea(Room
             if (obj is ItemInstance item)
             {
                 bbox = GetItemBoundingBox(obj.Room.Level, item.ItemType.IsStatic
-                    ? (IWadObject)obj.Room.Level.Settings?.WadTryGetStatic(item.ItemType.StaticId)
-                    : (IWadObject)obj.Room.Level.Settings?.WadTryGetMoveable(item.ItemType.MoveableId));
+                    ? obj.Room.Level.Settings?.WadTryGetStatic(item.ItemType.StaticId)
+                    : obj.Room.Level.Settings?.WadTryGetMoveable(item.ItemType.MoveableId));
             }
             else if (obj is ImportedGeometryInstance geoInst && geoInst.Model != null)
                 bbox = GetItemBoundingBox(obj.Room.Level, geoInst.Model);
@@ -769,7 +769,7 @@ public static void SelectObjectsWithBrush(Editor editor, Room room, float center
                 foreach (var obj in objectsInArea)
                 {
                     bool alreadySelected = editor.SelectedObject == obj ||
-                        (editor.SelectedObject is ObjectGroup existing && existing.Contains(obj));
+                        editor.SelectedObject is ObjectGroup existing && existing.Contains(obj);
                     if (!alreadySelected)
                         EditorActions.MultiSelect(obj);
                 }
diff --git a/TombEditor/Controls/ObjectBrush/ObjectBrushToolbox.Designer.cs b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolbox.Designer.cs
similarity index 83%
rename from TombEditor/Controls/ObjectBrush/ObjectBrushToolbox.Designer.cs
rename to TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolbox.Designer.cs
index 3e92b7334c..8897202617 100644
--- a/TombEditor/Controls/ObjectBrush/ObjectBrushToolbox.Designer.cs
+++ b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolbox.Designer.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.Controls.ObjectBrush
+namespace TombEditor.Features.Panel3D.ObjectBrush
 {
     partial class ObjectBrushToolbox
     {
@@ -20,7 +20,7 @@ protected override void Dispose(bool disposing)
         private void InitializeComponent()
         {
             _elementHost = new System.Windows.Forms.Integration.ElementHost();
-            _toolboxView = new Views.ObjectBrushToolboxView();
+            _toolboxView = new ObjectBrushToolboxView();
             SuspendLayout();
             // 
             // _elementHost
@@ -31,7 +31,6 @@ private void InitializeComponent()
             // 
             // ObjectBrushToolbox
             // 
-            BackColor = System.Drawing.Color.FromArgb(60, 63, 65);
             Controls.Add(_elementHost);
             Name = "ObjectBrushToolbox";
             Size = new System.Drawing.Size(404, 94);
@@ -41,6 +40,6 @@ private void InitializeComponent()
         #endregion
 
         private System.Windows.Forms.Integration.ElementHost _elementHost;
-        private Views.ObjectBrushToolboxView _toolboxView;
+        private ObjectBrushToolboxView _toolboxView;
     }
 }
diff --git a/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolbox.cs b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolbox.cs
new file mode 100644
index 0000000000..a6bc94608e
--- /dev/null
+++ b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolbox.cs
@@ -0,0 +1,43 @@
+using DarkUI.Controls;
+using System;
+
+namespace TombEditor.Features.Panel3D.ObjectBrush;
+
+public partial class ObjectBrushToolbox : DarkFloatingToolbox
+{
+	public ObjectBrushToolbox()
+	{
+		VerticalGrip = false;
+		GripSize = 12;
+		AutoAnchor = true;
+		SnapToBorders = true;
+		DragAnyPoint = true;
+
+		InitializeComponent();
+
+		_toolboxView.Loaded += OnToolboxViewLoaded;
+	}
+
+	private void OnToolboxViewLoaded(object sender, System.Windows.RoutedEventArgs e)
+	{
+		_toolboxView.Loaded -= OnToolboxViewLoaded;
+		UpdateSizeFromContent();
+	}
+
+	// Measures WPF content and resizes the floating toolbox to fit.
+	private void UpdateSizeFromContent()
+	{
+		_toolboxView.Measure(new System.Windows.Size(
+			double.PositiveInfinity, double.PositiveInfinity));
+
+		var desired = _toolboxView.DesiredSize;
+		float dpiScale = DeviceDpi / 96f;
+
+		int contentWidth = (int)Math.Ceiling(desired.Width * dpiScale);
+		int contentHeight = (int)Math.Ceiling(desired.Height * dpiScale);
+
+		Size = new System.Drawing.Size(
+			contentWidth + Padding.Left + Padding.Right,
+			contentHeight + Padding.Top + Padding.Bottom);
+	}
+}
diff --git a/TombEditor/Controls/ObjectBrush/ObjectBrushToolbox.resx b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolbox.resx
similarity index 100%
rename from TombEditor/Controls/ObjectBrush/ObjectBrushToolbox.resx
rename to TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolbox.resx
diff --git a/TombEditor/Views/ObjectBrushToolboxView.xaml b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxView.xaml
similarity index 95%
rename from TombEditor/Views/ObjectBrushToolboxView.xaml
rename to TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxView.xaml
index 22a9ac6bf5..ff20c4f78f 100644
--- a/TombEditor/Views/ObjectBrushToolboxView.xaml
+++ b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxView.xaml
@@ -1,14 +1,14 @@
 <UserControl
-	x:Class="TombEditor.Views.ObjectBrushToolboxView"
+	x:Class="TombEditor.Features.Panel3D.ObjectBrush.ObjectBrushToolboxView"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:controls="clr-namespace:DarkUI.WPF.CustomControls;assembly=DarkUI.WPF"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:local="clr-namespace:TombEditor.Features.Panel3D.ObjectBrush"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
-	xmlns:viewModels="clr-namespace:TombEditor.ViewModels"
-	d:DataContext="{d:DesignInstance Type=viewModels:ObjectBrushToolboxViewModel}"
+	d:DataContext="{d:DesignInstance Type=local:ObjectBrushToolboxViewModel}"
 	Background="{DynamicResource Brush_Background}"
 	Foreground="{DynamicResource Brush_Text}"
 	SnapsToDevicePixels="{x:Static darkUI:Defaults.SnapsToDevicePixels}"
diff --git a/TombEditor/Views/ObjectBrushToolboxView.xaml.cs b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxView.xaml.cs
similarity index 91%
rename from TombEditor/Views/ObjectBrushToolboxView.xaml.cs
rename to TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxView.xaml.cs
index 24a29cfbed..f8279d2aaa 100644
--- a/TombEditor/Views/ObjectBrushToolboxView.xaml.cs
+++ b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxView.xaml.cs
@@ -1,9 +1,7 @@
 using System.ComponentModel;
 using System.Windows.Controls;
 
-using TombEditor.ViewModels;
-
-namespace TombEditor.Views;
+namespace TombEditor.Features.Panel3D.ObjectBrush;
 
 public partial class ObjectBrushToolboxView : UserControl
 {
diff --git a/TombEditor/ViewModels/ObjectBrushToolboxViewModel.cs b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxViewModel.cs
similarity index 96%
rename from TombEditor/ViewModels/ObjectBrushToolboxViewModel.cs
rename to TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxViewModel.cs
index b89f777425..44c217abc2 100644
--- a/TombEditor/ViewModels/ObjectBrushToolboxViewModel.cs
+++ b/TombEditor/Features/Panel3D/ObjectBrush/ObjectBrushToolboxViewModel.cs
@@ -4,7 +4,7 @@
 using System;
 using TombLib.LevelData;
 
-namespace TombEditor.ViewModels;
+namespace TombEditor.Features.Panel3D.ObjectBrush;
 
 /// <summary>
 /// ViewModel for the Object Brush Toolbox panel.
@@ -110,8 +110,8 @@ private void LoadSettings()
 
 		var config = _editor.Configuration;
 
-		Radius = Math.Clamp(config.ObjectBrush_Radius / Level.SectorSizeUnit, Controls.ObjectBrush.Constants.MinRadius, Controls.ObjectBrush.Constants.MaxRadius);
-		Density = Math.Clamp(config.ObjectBrush_Density, Controls.ObjectBrush.Constants.MinDensity, Controls.ObjectBrush.Constants.MaxDensity);
+		Radius = Math.Clamp(config.ObjectBrush_Radius / Level.SectorSizeUnit, Constants.MinRadius, Constants.MaxRadius);
+		Density = Math.Clamp(config.ObjectBrush_Density, Constants.MinDensity, Constants.MaxDensity);
 		Rotation = Math.Clamp(config.ObjectBrush_Rotation, 0.0, 360.0);
 		IsOrthogonal = config.ObjectBrush_Orthogonal;
 		IsRandomRotation = config.ObjectBrush_RandomizeRotation;
diff --git a/TombEditor/ToolWindows/ToolPalette.Designer.cs b/TombEditor/Features/Panel3D/ToolPalette/ToolPalette.Designer.cs
similarity index 94%
rename from TombEditor/ToolWindows/ToolPalette.Designer.cs
rename to TombEditor/Features/Panel3D/ToolPalette/ToolPalette.Designer.cs
index ac9480b753..02b54535e7 100644
--- a/TombEditor/ToolWindows/ToolPalette.Designer.cs
+++ b/TombEditor/Features/Panel3D/ToolPalette/ToolPalette.Designer.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.Panel3D.ToolPalette
 {
     partial class ToolPalette
     {
@@ -28,7 +28,7 @@ protected override void Dispose(bool disposing)
         /// </summary>
         private void InitializeComponent()
         {
-            this.toolBox = new TombEditor.Controls.ToolBox();
+            this.toolBox = new Toolbox();
             this.SuspendLayout();
             // 
             // toolBox
@@ -62,6 +62,6 @@ private void InitializeComponent()
 
         #endregion
 
-        private Controls.ToolBox toolBox;
+        private Toolbox toolBox;
     }
 }
diff --git a/TombEditor/Features/Panel3D/ToolPalette/ToolPalette.cs b/TombEditor/Features/Panel3D/ToolPalette/ToolPalette.cs
new file mode 100644
index 0000000000..179910e2a9
--- /dev/null
+++ b/TombEditor/Features/Panel3D/ToolPalette/ToolPalette.cs
@@ -0,0 +1,17 @@
+using DarkUI.Docking;
+using System;
+
+namespace TombEditor.Features.Panel3D.ToolPalette;
+
+public partial class ToolPalette : DarkToolWindow
+{
+	public ToolPalette()
+	{
+		InitializeComponent();
+	}
+
+	private void toolBox_SizeChanged(object sender, EventArgs e)
+	{
+		AutoSize = true;
+	}
+}
diff --git a/TombEditor/ToolWindows/ToolPalette.resx b/TombEditor/Features/Panel3D/ToolPalette/ToolPalette.resx
similarity index 100%
rename from TombEditor/ToolWindows/ToolPalette.resx
rename to TombEditor/Features/Panel3D/ToolPalette/ToolPalette.resx
diff --git a/TombEditor/ToolWindows/ToolPaletteFloating.Designer.cs b/TombEditor/Features/Panel3D/ToolPalette/ToolPaletteFloating.Designer.cs
similarity index 90%
rename from TombEditor/ToolWindows/ToolPaletteFloating.Designer.cs
rename to TombEditor/Features/Panel3D/ToolPalette/ToolPaletteFloating.Designer.cs
index e1348e504a..864d1eb526 100644
--- a/TombEditor/ToolWindows/ToolPaletteFloating.Designer.cs
+++ b/TombEditor/Features/Panel3D/ToolPalette/ToolPaletteFloating.Designer.cs
@@ -1,4 +1,4 @@
-namespace TombEditor.ToolWindows
+namespace TombEditor.Features.Panel3D.ToolPalette
 {
     partial class ToolPaletteFloating
     {
@@ -10,7 +10,7 @@ partial class ToolPaletteFloating
         /// </summary>
         private void InitializeComponent()
         {
-            this.toolBox = new TombEditor.Controls.ToolBox();
+            this.toolBox = new Toolbox();
             this.SuspendLayout();
             // 
             // toolBox
@@ -37,6 +37,6 @@ private void InitializeComponent()
 
         #endregion
 
-        private Controls.ToolBox toolBox;
+        private Toolbox toolBox;
     }
 }
diff --git a/TombEditor/Features/Panel3D/ToolPalette/ToolPaletteFloating.cs b/TombEditor/Features/Panel3D/ToolPalette/ToolPaletteFloating.cs
new file mode 100644
index 0000000000..d3bb7c5cdf
--- /dev/null
+++ b/TombEditor/Features/Panel3D/ToolPalette/ToolPaletteFloating.cs
@@ -0,0 +1,17 @@
+using DarkUI.Controls;
+using System;
+
+namespace TombEditor.Features.Panel3D.ToolPalette;
+
+public partial class ToolPaletteFloating : DarkFloatingToolbox
+{
+	public ToolPaletteFloating()
+	{
+		InitializeComponent();
+	}
+
+	private void toolBox_SizeChanged(object sender, EventArgs e)
+	{
+		AutoSize = true;
+	}
+}
diff --git a/TombEditor/ToolWindows/ToolPaletteFloating.resx b/TombEditor/Features/Panel3D/ToolPalette/ToolPaletteFloating.resx
similarity index 100%
rename from TombEditor/ToolWindows/ToolPaletteFloating.resx
rename to TombEditor/Features/Panel3D/ToolPalette/ToolPaletteFloating.resx
diff --git a/TombEditor/Controls/ToolBox.Designer.cs b/TombEditor/Features/Panel3D/ToolPalette/Toolbox.Designer.cs
similarity index 89%
rename from TombEditor/Controls/ToolBox.Designer.cs
rename to TombEditor/Features/Panel3D/ToolPalette/Toolbox.Designer.cs
index 8d18bacb68..2c8c0390cd 100644
--- a/TombEditor/Controls/ToolBox.Designer.cs
+++ b/TombEditor/Features/Panel3D/ToolPalette/Toolbox.Designer.cs
@@ -1,6 +1,6 @@
-namespace TombEditor.Controls
+namespace TombEditor.Features.Panel3D.ToolPalette
 {
-    partial class ToolBox
+    partial class Toolbox
     {
         private System.ComponentModel.IContainer components = null;
 
@@ -20,7 +20,7 @@ protected override void Dispose(bool disposing)
         private void InitializeComponent()
         {
             _elementHost = new System.Windows.Forms.Integration.ElementHost();
-            _toolBoxView = new Views.ToolBoxView();
+            _toolBoxView = new ToolboxView();
             SuspendLayout();
             // 
             // _elementHost
@@ -45,6 +45,6 @@ private void InitializeComponent()
         #endregion
 
         private System.Windows.Forms.Integration.ElementHost _elementHost;
-        private Views.ToolBoxView _toolBoxView;
+        private ToolboxView _toolBoxView;
     }
 }
diff --git a/TombEditor/Controls/ToolBox.cs b/TombEditor/Features/Panel3D/ToolPalette/Toolbox.cs
similarity index 93%
rename from TombEditor/Controls/ToolBox.cs
rename to TombEditor/Features/Panel3D/ToolPalette/Toolbox.cs
index 800e2a4eab..6dc3acc303 100644
--- a/TombEditor/Controls/ToolBox.cs
+++ b/TombEditor/Features/Panel3D/ToolPalette/Toolbox.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Windows.Forms;
 
-namespace TombEditor.Controls
+namespace TombEditor.Features.Panel3D.ToolPalette
 {
-    public partial class ToolBox : UserControl
+    public partial class Toolbox : UserControl
     {
         public ToolStripLayoutStyle LayoutStyle
         {
@@ -27,7 +27,7 @@ public ToolStripLayoutStyle LayoutStyle
         private ToolStripLayoutStyle _layoutStyle = ToolStripLayoutStyle.VerticalStackWithOverflow;
         private int _lastMeasuredWidth = -1;
 
-        public ToolBox()
+        public Toolbox()
         {
             InitializeComponent();
             _toolBoxView.SetWinFormsHost(_elementHost);
diff --git a/TombEditor/Controls/ToolBox.resx b/TombEditor/Features/Panel3D/ToolPalette/Toolbox.resx
similarity index 100%
rename from TombEditor/Controls/ToolBox.resx
rename to TombEditor/Features/Panel3D/ToolPalette/Toolbox.resx
diff --git a/TombEditor/Views/ToolBoxView.xaml b/TombEditor/Features/Panel3D/ToolPalette/ToolboxView.xaml
similarity index 98%
rename from TombEditor/Views/ToolBoxView.xaml
rename to TombEditor/Features/Panel3D/ToolPalette/ToolboxView.xaml
index 90225ca7af..6becf2d5b1 100644
--- a/TombEditor/Views/ToolBoxView.xaml
+++ b/TombEditor/Features/Panel3D/ToolPalette/ToolboxView.xaml
@@ -1,13 +1,13 @@
 <UserControl
-	x:Class="TombEditor.Views.ToolBoxView"
+	x:Class="TombEditor.Features.Panel3D.ToolPalette.ToolboxView"
 	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:darkUI="clr-namespace:DarkUI.WPF;assembly=DarkUI.WPF"
+	xmlns:local="clr-namespace:TombEditor.Features.Panel3D.ToolPalette"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:tombLib="clr-namespace:TombLib.WPF;assembly=TombLib.WPF"
-	xmlns:viewModels="clr-namespace:TombEditor.ViewModels"
-	d:DataContext="{d:DesignInstance Type=viewModels:ToolBoxViewModel}"
+	d:DataContext="{d:DesignInstance Type=local:ToolboxViewModel}"
 	d:DesignHeight="400"
 	d:DesignWidth="30"
 	Background="{DynamicResource Brush_Background}"
diff --git a/TombEditor/Views/ToolBoxView.xaml.cs b/TombEditor/Features/Panel3D/ToolPalette/ToolboxView.xaml.cs
similarity index 94%
rename from TombEditor/Views/ToolBoxView.xaml.cs
rename to TombEditor/Features/Panel3D/ToolPalette/ToolboxView.xaml.cs
index 7cdbbb8394..8f82be017f 100644
--- a/TombEditor/Views/ToolBoxView.xaml.cs
+++ b/TombEditor/Features/Panel3D/ToolPalette/ToolboxView.xaml.cs
@@ -5,11 +5,9 @@
 using System.Windows.Input;
 using System.Windows.Threading;
 
-using TombEditor.ViewModels;
+namespace TombEditor.Features.Panel3D.ToolPalette;
 
-namespace TombEditor.Views;
-
-public partial class ToolBoxView : UserControl
+public partial class ToolboxView : UserControl
 {
 	private DispatcherTimer _contextMenuTimer;
 
@@ -17,7 +15,7 @@ public partial class ToolBoxView : UserControl
 	private System.Windows.Forms.Control _winFormsHost;
 
 	// Reference to the ViewModel for cleanup purposes.
-	private ToolBoxViewModel _viewModel;
+	private ToolboxViewModel _viewModel;
 
 	// Fires when the preferred height of the visible content changes.
 	public event Action<int> PreferredHeightChanged;
@@ -25,19 +23,19 @@ public partial class ToolBoxView : UserControl
 	// Fires when the preferred width of the visible content changes.
 	public event Action<int> PreferredWidthChanged;
 
-	public ToolBoxView()
+	public ToolboxView()
 	{
 		InitializeComponent();
 		Loaded += OnLoaded;
 
 		if (!DesignerProperties.GetIsInDesignMode(this))
 		{
-			_viewModel = new ToolBoxViewModel();
+			_viewModel = new ToolboxViewModel();
 			DataContext = _viewModel;
 
 			_viewModel.PropertyChanged += (_, e) =>
 			{
-				if (e.PropertyName == nameof(ToolBoxViewModel.CurrentMode))
+				if (e.PropertyName == nameof(ToolboxViewModel.CurrentMode))
 					RequestHeightUpdate();
 			};
 
diff --git a/TombEditor/ViewModels/ToolBoxViewModel.cs b/TombEditor/Features/Panel3D/ToolPalette/ToolboxViewModel.cs
similarity index 97%
rename from TombEditor/ViewModels/ToolBoxViewModel.cs
rename to TombEditor/Features/Panel3D/ToolPalette/ToolboxViewModel.cs
index bee28d2494..635b749b12 100644
--- a/TombEditor/ViewModels/ToolBoxViewModel.cs
+++ b/TombEditor/Features/Panel3D/ToolPalette/ToolboxViewModel.cs
@@ -7,21 +7,21 @@
 using TombLib.WPF.Services;
 using TombLib.WPF.Services.Abstract;
 
-namespace TombEditor.ViewModels;
+namespace TombEditor.Features.Panel3D.ToolPalette;
 
 /// <summary>
-/// ViewModel for the ToolBox panel.
+/// ViewModel for the Toolbox panel.
 /// Manages tool selection state, mode-based visibility, and brush/texture settings.
 /// Icon assignment, DPI measurement, and WinForms interop remain in code-behind.
 /// </summary>
-public partial class ToolBoxViewModel : ObservableObject
+public partial class ToolboxViewModel : ObservableObject
 {
 	private readonly Editor _editor;
 	private readonly ILocalizationService _localizationService;
 
 	private const string GridPaintIconBase = "/TombEditor;component/Resources/icons_toolbox/toolbox_GridPaint";
 
-	public ToolBoxViewModel(ILocalizationService? localizationService = null)
+	public ToolboxViewModel(ILocalizationService? localizationService = null)
 	{
 		_editor = Editor.Instance;
 
diff --git a/TombEditor/Forms/FormFlybyCamera.cs b/TombEditor/Forms/FormFlybyCamera.cs
index 8a9fdac063..07160f16b4 100644
--- a/TombEditor/Forms/FormFlybyCamera.cs
+++ b/TombEditor/Forms/FormFlybyCamera.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TombEditor.Controls.FlybyTimeline.Sequence;
+using TombEditor.Features.FlybyTimeline.Sequence;
 using TombLib;
 using TombLib.LevelData;
 
diff --git a/TombEditor/Forms/FormMain.cs b/TombEditor/Forms/FormMain.cs
index 1ebb35f37f..9c574ec797 100644
--- a/TombEditor/Forms/FormMain.cs
+++ b/TombEditor/Forms/FormMain.cs
@@ -14,6 +14,18 @@
 using TombLib.LevelData;
 using TombLib.Utils;
 using TombEditor.ToolWindows;
+using TombEditor.Features.Panel3D.ObjectBrush;
+using TombEditor.Features.Panel3D.ToolPalette;
+using TombEditor.Features.DockableViews.ObjectList;
+using TombEditor.Features.DockableViews.TexturePanel;
+using TombEditor.Features.DockableViews.PalettePanel;
+using TombEditor.Features.DockableViews.LightingPanel;
+using TombEditor.Features.DockableViews.SectorOptionsPanel;
+using TombEditor.Features.DockableViews.ContentBrowser;
+using TombEditor.Features.DockableViews.ImportedGeometryBrowser;
+using TombEditor.Features.DockableViews.ItemBrowser;
+using TombEditor.Features.DockableViews.RoomOptionsPanel;
+using TombEditor.Features.DockableViews.TriggerList;
 
 namespace TombEditor.Forms
 {
@@ -42,7 +54,7 @@ public partial class FormMain : DarkForm
 
         // Floating tool boxes are placed on 3D view at runtime
         private readonly ToolPaletteFloating ToolBox = new ToolPaletteFloating();
-        private readonly Controls.ObjectBrush.ObjectBrushToolbox ObjectBrushSettings = new Controls.ObjectBrush.ObjectBrushToolbox();
+        private readonly ObjectBrushToolbox ObjectBrushSettings = new ObjectBrushToolbox();
 
         public FormMain(Editor editor)
         {
diff --git a/TombEditor/ObjectClipboardData.cs b/TombEditor/ObjectClipboardData.cs
index a8790518a9..55655c7c56 100644
--- a/TombEditor/ObjectClipboardData.cs
+++ b/TombEditor/ObjectClipboardData.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using TombEditor.Controls.FlybyTimeline;
+using TombEditor.Features.FlybyTimeline;
 using TombLib.IO;
 using TombLib.LevelData;
 using TombLib.LevelData.IO;
diff --git a/TombEditor/Program.cs b/TombEditor/Program.cs
index d419db7c1b..43c5869623 100644
--- a/TombEditor/Program.cs
+++ b/TombEditor/Program.cs
@@ -28,10 +28,6 @@ public static class Program
         [STAThread]
         public static void Main(string[] args)
         {
-            var services = WPFInitializer.InitializeWPF();
-            services.AddSingleton<ICustomGeometrySettingsPresetIOService, CustomGeometrySettingsPresetIOService>();
-            ServiceLocator.Configure(services.BuildServiceProvider());
-
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
             string startFile = null;
@@ -63,6 +59,10 @@ public static void Main(string[] args)
             // Update DarkUI configuration
             Colors.Brightness = configuration.UI_FormColor_Brightness / 100.0f;
 
+            var services = WPFInitializer.InitializeWPF();
+            services.AddSingleton<ICustomGeometrySettingsPresetIOService, CustomGeometrySettingsPresetIOService>();
+            ServiceLocator.Configure(services.BuildServiceProvider());
+
             if (configuration.Editor_AllowMultipleInstances || doBatchCompile ||
                 mutex.WaitOne(TimeSpan.Zero, true))
             {
diff --git a/TombEditor/TombEditor.csproj b/TombEditor/TombEditor.csproj
index 6948354235..897db1a271 100644
--- a/TombEditor/TombEditor.csproj
+++ b/TombEditor/TombEditor.csproj
@@ -9,6 +9,8 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <Configurations>Debug;Release</Configurations>
     <Platforms>x64;x86</Platforms>
+    <ApplicationIcon>TE.ico</ApplicationIcon>
+    <StartupObject>TombEditor.Program</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <OutputPath>..\Build ($(Platform))\</OutputPath>
@@ -24,12 +26,6 @@
   <PropertyGroup Condition="'$(Platform)'=='x86'">
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>TE.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>TombEditor.Program</StartupObject>
-  </PropertyGroup>
   <ItemGroup>
     <Page Update="Properties\DesignTimeResources.xaml">
       <Generator>MSBuild:Compile</Generator>
@@ -78,21 +74,13 @@
     <Compile Include="..\GlobalPaths.cs">
       <Link>GlobalPaths.cs</Link>
     </Compile>
-    <Compile Update="Controls\ContextMenus\GridPaintContextMenu.cs" />
-    <Compile Update="Controls\ContextMenus\Space2DMapContextMenu.cs" />
-    <Compile Update="Controls\PanelRenderingImportedGeometry.cs" />
-    <Compile Update="Controls\PanelRenderingSprite.cs" />
+    <Compile Remove="EditorCommands.cs" />
     <Compile Update="Controls\RichTextLabel.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Update="Controls\ToolBox.cs">
+    <Compile Update="Features\Panel3D\ToolPalette\Toolbox.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Update="Controls\ContextMenus\BaseContextMenu.cs" />
-    <Compile Update="Controls\ContextMenus\SelectedGeometryContextMenu.cs" />
-    <Compile Update="Controls\ContextMenus\SectorContextMenu.cs" />
-    <Compile Update="Controls\ContextMenus\SelectedRoomContextMenu.cs" />
-    <Compile Update="Controls\ContextMenus\MaterialObjectContextMenu.cs" />
     <Compile Update="Controls\ImportedGeometryManager.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -102,7 +90,12 @@
     <Compile Update="Controls\PanelPalette.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Update="Controls\PanelRenderingItem.cs" />
+    <Compile Update="Controls\Panel2DMap.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Update="Controls\Panel2DGrid.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Update="Forms\FormPortal.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -116,27 +109,6 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Update="ToolWindows\ImportedGeometryBrowser.cs" />
-    <Compile Update="ToolWindows\Lighting.cs" />
-    <Compile Update="ToolWindows\MainView.cs" />
-    <Compile Update="ToolWindows\ObjectList.cs" />
-    <Compile Update="ToolWindows\Palette.cs" />
-    <Compile Update="ToolWindows\TexturePanel.cs" />
-    <Compile Update="ToolWindows\ToolPalette.cs" />
-    <Compile Update="ToolWindows\ToolPaletteFloating.cs" />
-    <Compile Update="ToolWindows\TriggerList.cs" />
-    <Compile Update="ToolWindows\RoomOptions.cs" />
-    <Compile Update="ToolWindows\ContentBrowser.cs" />
-    <Compile Update="ToolWindows\ItemBrowser.cs" />
-    <Compile Update="ToolWindows\SectorOptions.cs" />
-    <Compile Update="Controls\Panel2DMap.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="Controls\Panel2DGrid.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="Controls\Panel3D\Panel3D.cs" />
-    <Compile Update="Controls\PanelTextureMap.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DarkUI\DarkUI\DarkUI.csproj" />
@@ -148,28 +120,19 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="TE.ico" />
-  </ItemGroup>
-  <ItemGroup>
+    <Resource Include="Resources\icons_actions\*.png" />
+    <Resource Include="Resources\icons_general\*.png" />
+    <Resource Include="Resources\icons_objects\*.png" />
+    <Resource Include="Resources\icons_sectortype\*.png" />
+    <Resource Include="Resources\icons_texture\*.png" />
     <Resource Include="Resources\icons_toolbox\*.png" />
-    <Resource Include="Resources\icons_objects\objects_volume-sphere-16.png" />
-    <Resource Include="Resources\icons_objects\objects_volume-box-16.png" />
-    <Resource Include="Resources\icons_actions\actions_TextureMode-16.png" />
-    <Resource Include="Resources\icons_actions\actions_StarOutlined-16.png" />
-    <Resource Include="Resources\icons_actions\actions_StarFilled-16.png" />
-    <Resource Include="Resources\icons_actions\actions_play-16.png" />
-    <Resource Include="Resources\icons_actions\actions_3DView-16.png" />
-    <Resource Include="Resources\icons_actions\actions_delete-16.png" />
-    <Resource Include="Resources\icons_general\general_plus_math-16.png" />
-    <Resource Include="Resources\icons_general\general_trash-16.png" />
     <Resource Include="Resources\icons_transport\*.png" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="NLog" Version="5.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="EditorCommands.cs" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
diff --git a/TombEditor/ToolWindows/Lighting.Designer.cs b/TombEditor/ToolWindows/Lighting.Designer.cs
deleted file mode 100644
index a77c7aaad2..0000000000
--- a/TombEditor/ToolWindows/Lighting.Designer.cs
+++ /dev/null
@@ -1,534 +0,0 @@
-namespace TombEditor.ToolWindows
-{
-    partial class Lighting
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        #region Component Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.cbLightIsDynamicallyUsed = new DarkUI.Controls.DarkCheckBox();
-            this.cbLightIsStaticallyUsed = new DarkUI.Controls.DarkCheckBox();
-            this.cbLightIsObstructedByRoomGeometry = new DarkUI.Controls.DarkCheckBox();
-            this.cbLightEnabled = new DarkUI.Controls.DarkCheckBox();
-            this.panelLightColor = new DarkUI.Controls.DarkPanel();
-            this.darkLabel12 = new DarkUI.Controls.DarkLabel();
-            this.darkLabel13 = new DarkUI.Controls.DarkLabel();
-            this.darkLabel11 = new DarkUI.Controls.DarkLabel();
-            this.darkLabel9 = new DarkUI.Controls.DarkLabel();
-            this.darkLabel10 = new DarkUI.Controls.DarkLabel();
-            this.darkLabel8 = new DarkUI.Controls.DarkLabel();
-            this.darkLabel7 = new DarkUI.Controls.DarkLabel();
-            this.butAddLight = new DarkUI.Controls.DarkButton();
-            this.numIntensity = new DarkUI.Controls.DarkNumericUpDown();
-            this.numInnerRange = new DarkUI.Controls.DarkNumericUpDown();
-            this.numOuterRange = new DarkUI.Controls.DarkNumericUpDown();
-            this.numInnerAngle = new DarkUI.Controls.DarkNumericUpDown();
-            this.numOuterAngle = new DarkUI.Controls.DarkNumericUpDown();
-            this.numDirectionX = new DarkUI.Controls.DarkNumericUpDown();
-            this.numDirectionY = new DarkUI.Controls.DarkNumericUpDown();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.cbLightIsUsedForImportedGeometry = new DarkUI.Controls.DarkCheckBox();
-            this.cmbLightQuality = new DarkUI.Controls.DarkComboBox();
-            this.cmbLightTypes = new DarkUI.Controls.DarkComboBox();
-            this.cbLightCastsShadow = new DarkUI.Controls.DarkCheckBox();
-            this.darkLabel6 = new DarkUI.Controls.DarkLabel();
-            ((System.ComponentModel.ISupportInitialize)(this.numIntensity)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numInnerRange)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numOuterRange)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numInnerAngle)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numOuterAngle)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numDirectionX)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numDirectionY)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // cbLightIsDynamicallyUsed
-            // 
-            this.cbLightIsDynamicallyUsed.Enabled = false;
-            this.cbLightIsDynamicallyUsed.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cbLightIsDynamicallyUsed.Location = new System.Drawing.Point(79, 100);
-            this.cbLightIsDynamicallyUsed.Name = "cbLightIsDynamicallyUsed";
-            this.cbLightIsDynamicallyUsed.Size = new System.Drawing.Size(70, 22);
-            this.cbLightIsDynamicallyUsed.TabIndex = 18;
-            this.cbLightIsDynamicallyUsed.Text = "Dynamic";
-            this.toolTip.SetToolTip(this.cbLightIsDynamicallyUsed, "Use light for moveables ingame");
-            this.cbLightIsDynamicallyUsed.CheckedChanged += new System.EventHandler(this.cbLightIsDynamicallyUsed_CheckedChanged);
-            // 
-            // cbLightIsStaticallyUsed
-            // 
-            this.cbLightIsStaticallyUsed.Enabled = false;
-            this.cbLightIsStaticallyUsed.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cbLightIsStaticallyUsed.Location = new System.Drawing.Point(79, 81);
-            this.cbLightIsStaticallyUsed.Name = "cbLightIsStaticallyUsed";
-            this.cbLightIsStaticallyUsed.Size = new System.Drawing.Size(70, 22);
-            this.cbLightIsStaticallyUsed.TabIndex = 17;
-            this.cbLightIsStaticallyUsed.Text = "Static";
-            this.toolTip.SetToolTip(this.cbLightIsStaticallyUsed, "Use light for room geometry lighting");
-            this.cbLightIsStaticallyUsed.CheckedChanged += new System.EventHandler(this.cbLightIsStaticallyUsed_CheckedChanged);
-            // 
-            // cbLightIsObstructedByRoomGeometry
-            // 
-            this.cbLightIsObstructedByRoomGeometry.Enabled = false;
-            this.cbLightIsObstructedByRoomGeometry.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cbLightIsObstructedByRoomGeometry.Location = new System.Drawing.Point(3, 100);
-            this.cbLightIsObstructedByRoomGeometry.Name = "cbLightIsObstructedByRoomGeometry";
-            this.cbLightIsObstructedByRoomGeometry.Size = new System.Drawing.Size(70, 22);
-            this.cbLightIsObstructedByRoomGeometry.TabIndex = 16;
-            this.cbLightIsObstructedByRoomGeometry.Text = "Obstruct";
-            this.toolTip.SetToolTip(this.cbLightIsObstructedByRoomGeometry, "Determines whether the effect of this light is obstructed by room geometry");
-            this.cbLightIsObstructedByRoomGeometry.CheckedChanged += new System.EventHandler(this.cbLightIsObstructedByRoomGeometry_CheckedChanged);
-            // 
-            // cbLightEnabled
-            // 
-            this.cbLightEnabled.Enabled = false;
-            this.cbLightEnabled.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cbLightEnabled.Location = new System.Drawing.Point(3, 81);
-            this.cbLightEnabled.Name = "cbLightEnabled";
-            this.cbLightEnabled.Size = new System.Drawing.Size(65, 22);
-            this.cbLightEnabled.TabIndex = 15;
-            this.cbLightEnabled.Text = "Enabled";
-            this.toolTip.SetToolTip(this.cbLightEnabled, "Light is enabled");
-            this.cbLightEnabled.CheckedChanged += new System.EventHandler(this.cbLightEnabled_CheckedChanged);
-            // 
-            // panelLightColor
-            // 
-            this.panelLightColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panelLightColor.Enabled = false;
-            this.panelLightColor.Location = new System.Drawing.Point(206, 28);
-            this.panelLightColor.Name = "panelLightColor";
-            this.panelLightColor.Size = new System.Drawing.Size(60, 22);
-            this.panelLightColor.TabIndex = 7;
-            this.toolTip.SetToolTip(this.panelLightColor, "Light color");
-            this.panelLightColor.Click += new System.EventHandler(this.panelLightColor_Click);
-            // 
-            // darkLabel12
-            // 
-            this.darkLabel12.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.darkLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
-            this.darkLabel12.Location = new System.Drawing.Point(268, 84);
-            this.darkLabel12.Name = "darkLabel12";
-            this.darkLabel12.Size = new System.Drawing.Size(38, 22);
-            this.darkLabel12.TabIndex = 80;
-            this.darkLabel12.Text = "Dir Y";
-            this.darkLabel12.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // darkLabel13
-            // 
-            this.darkLabel13.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.darkLabel13.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
-            this.darkLabel13.Location = new System.Drawing.Point(268, 113);
-            this.darkLabel13.Name = "darkLabel13";
-            this.darkLabel13.Size = new System.Drawing.Size(38, 22);
-            this.darkLabel13.TabIndex = 79;
-            this.darkLabel13.Text = "Dir X";
-            this.darkLabel13.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // darkLabel11
-            // 
-            this.darkLabel11.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.darkLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
-            this.darkLabel11.Location = new System.Drawing.Point(155, 55);
-            this.darkLabel11.Name = "darkLabel11";
-            this.darkLabel11.Size = new System.Drawing.Size(51, 22);
-            this.darkLabel11.TabIndex = 78;
-            this.darkLabel11.Text = "Intensity";
-            this.darkLabel11.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // darkLabel9
-            // 
-            this.darkLabel9.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.darkLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
-            this.darkLabel9.Location = new System.Drawing.Point(268, 55);
-            this.darkLabel9.Name = "darkLabel9";
-            this.darkLabel9.Size = new System.Drawing.Size(38, 22);
-            this.darkLabel9.TabIndex = 77;
-            this.darkLabel9.Text = "Out α";
-            this.darkLabel9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // darkLabel10
-            // 
-            this.darkLabel10.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.darkLabel10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
-            this.darkLabel10.Location = new System.Drawing.Point(268, 26);
-            this.darkLabel10.Name = "darkLabel10";
-            this.darkLabel10.Size = new System.Drawing.Size(38, 22);
-            this.darkLabel10.TabIndex = 73;
-            this.darkLabel10.Text = "In α";
-            this.darkLabel10.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // darkLabel8
-            // 
-            this.darkLabel8.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.darkLabel8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
-            this.darkLabel8.Location = new System.Drawing.Point(155, 113);
-            this.darkLabel8.Name = "darkLabel8";
-            this.darkLabel8.Size = new System.Drawing.Size(51, 22);
-            this.darkLabel8.TabIndex = 71;
-            this.darkLabel8.Text = "Out d";
-            this.darkLabel8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // darkLabel7
-            // 
-            this.darkLabel7.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.darkLabel7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
-            this.darkLabel7.Location = new System.Drawing.Point(155, 84);
-            this.darkLabel7.Name = "darkLabel7";
-            this.darkLabel7.Size = new System.Drawing.Size(51, 22);
-            this.darkLabel7.TabIndex = 70;
-            this.darkLabel7.Text = "In d";
-            this.darkLabel7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // butAddLight
-            // 
-            this.butAddLight.Checked = false;
-            this.butAddLight.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.butAddLight.Image = global::TombEditor.Properties.Resources.general_plus_math_16;
-            this.butAddLight.Location = new System.Drawing.Point(123, 28);
-            this.butAddLight.Name = "butAddLight";
-            this.butAddLight.Size = new System.Drawing.Size(23, 23);
-            this.butAddLight.TabIndex = 0;
-            this.butAddLight.Tag = "";
-            this.toolTip.SetToolTip(this.butAddLight, "Place light");
-            this.butAddLight.Click += new System.EventHandler(this.butAddLight_Click);
-            // 
-            // numIntensity
-            // 
-            this.numIntensity.DecimalPlaces = 2;
-            this.numIntensity.Enabled = false;
-            this.numIntensity.Increment = new decimal(new int[] {
-            3,
-            0,
-            0,
-            131072});
-            this.numIntensity.IncrementAlternate = new decimal(new int[] {
-            12,
-            0,
-            0,
-            131072});
-            this.numIntensity.Location = new System.Drawing.Point(206, 57);
-            this.numIntensity.LoopValues = false;
-            this.numIntensity.Maximum = new decimal(new int[] {
-            128,
-            0,
-            0,
-            0});
-            this.numIntensity.Minimum = new decimal(new int[] {
-            128,
-            0,
-            0,
-            -2147483648});
-            this.numIntensity.Name = "numIntensity";
-            this.numIntensity.Size = new System.Drawing.Size(60, 22);
-            this.numIntensity.TabIndex = 8;
-            this.numIntensity.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip.SetToolTip(this.numIntensity, "Light intensity");
-            this.numIntensity.ValueChanged += new System.EventHandler(this.numIntensity_ValueChanged);
-            // 
-            // numInnerRange
-            // 
-            this.numInnerRange.DecimalPlaces = 2;
-            this.numInnerRange.Enabled = false;
-            this.numInnerRange.Increment = new decimal(new int[] {
-            3,
-            0,
-            0,
-            131072});
-            this.numInnerRange.IncrementAlternate = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numInnerRange.Location = new System.Drawing.Point(206, 86);
-            this.numInnerRange.LoopValues = false;
-            this.numInnerRange.Maximum = new decimal(new int[] {
-            256,
-            0,
-            0,
-            0});
-            this.numInnerRange.Name = "numInnerRange";
-            this.numInnerRange.Size = new System.Drawing.Size(60, 22);
-            this.numInnerRange.TabIndex = 9;
-            this.numInnerRange.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip.SetToolTip(this.numInnerRange, "Inner radius or distance");
-            this.numInnerRange.ValueChanged += new System.EventHandler(this.numInnerRange_ValueChanged);
-            // 
-            // numOuterRange
-            // 
-            this.numOuterRange.DecimalPlaces = 2;
-            this.numOuterRange.Enabled = false;
-            this.numOuterRange.Increment = new decimal(new int[] {
-            3,
-            0,
-            0,
-            131072});
-            this.numOuterRange.IncrementAlternate = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.numOuterRange.Location = new System.Drawing.Point(206, 115);
-            this.numOuterRange.LoopValues = false;
-            this.numOuterRange.Maximum = new decimal(new int[] {
-            256,
-            0,
-            0,
-            0});
-            this.numOuterRange.Name = "numOuterRange";
-            this.numOuterRange.Size = new System.Drawing.Size(60, 22);
-            this.numOuterRange.TabIndex = 10;
-            this.numOuterRange.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip.SetToolTip(this.numOuterRange, "Outer radius or distance");
-            this.numOuterRange.ValueChanged += new System.EventHandler(this.numOuterRange_ValueChanged);
-            // 
-            // numInnerAngle
-            // 
-            this.numInnerAngle.DecimalPlaces = 2;
-            this.numInnerAngle.Enabled = false;
-            this.numInnerAngle.IncrementAlternate = new decimal(new int[] {
-            10,
-            0,
-            0,
-            0});
-            this.numInnerAngle.Location = new System.Drawing.Point(306, 28);
-            this.numInnerAngle.LoopValues = false;
-            this.numInnerAngle.Maximum = new decimal(new int[] {
-            180,
-            0,
-            0,
-            0});
-            this.numInnerAngle.Name = "numInnerAngle";
-            this.numInnerAngle.Size = new System.Drawing.Size(60, 22);
-            this.numInnerAngle.TabIndex = 11;
-            this.numInnerAngle.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip.SetToolTip(this.numInnerAngle, "Inner cone angle");
-            this.numInnerAngle.ValueChanged += new System.EventHandler(this.numInnerAngle_ValueChanged);
-            // 
-            // numOuterAngle
-            // 
-            this.numOuterAngle.DecimalPlaces = 2;
-            this.numOuterAngle.Enabled = false;
-            this.numOuterAngle.IncrementAlternate = new decimal(new int[] {
-            10,
-            0,
-            0,
-            0});
-            this.numOuterAngle.Location = new System.Drawing.Point(306, 57);
-            this.numOuterAngle.LoopValues = false;
-            this.numOuterAngle.Maximum = new decimal(new int[] {
-            180,
-            0,
-            0,
-            0});
-            this.numOuterAngle.Name = "numOuterAngle";
-            this.numOuterAngle.Size = new System.Drawing.Size(60, 22);
-            this.numOuterAngle.TabIndex = 12;
-            this.numOuterAngle.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip.SetToolTip(this.numOuterAngle, "Outer cone angle");
-            this.numOuterAngle.ValueChanged += new System.EventHandler(this.numOuterAngle_ValueChanged);
-            // 
-            // numDirectionX
-            // 
-            this.numDirectionX.DecimalPlaces = 2;
-            this.numDirectionX.Enabled = false;
-            this.numDirectionX.IncrementAlternate = new decimal(new int[] {
-            10,
-            0,
-            0,
-            0});
-            this.numDirectionX.Location = new System.Drawing.Point(306, 115);
-            this.numDirectionX.LoopValues = false;
-            this.numDirectionX.Maximum = new decimal(new int[] {
-            90,
-            0,
-            0,
-            0});
-            this.numDirectionX.Minimum = new decimal(new int[] {
-            90,
-            0,
-            0,
-            -2147483648});
-            this.numDirectionX.Name = "numDirectionX";
-            this.numDirectionX.Size = new System.Drawing.Size(60, 22);
-            this.numDirectionX.TabIndex = 14;
-            this.numDirectionX.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip.SetToolTip(this.numDirectionX, "Angle around the X axis (vertical rotation)");
-            this.numDirectionX.ValueChanged += new System.EventHandler(this.numDirectionX_ValueChanged);
-            // 
-            // numDirectionY
-            // 
-            this.numDirectionY.DecimalPlaces = 2;
-            this.numDirectionY.Enabled = false;
-            this.numDirectionY.IncrementAlternate = new decimal(new int[] {
-            10,
-            0,
-            0,
-            0});
-            this.numDirectionY.Location = new System.Drawing.Point(306, 86);
-            this.numDirectionY.LoopValues = false;
-            this.numDirectionY.Maximum = new decimal(new int[] {
-            720,
-            0,
-            0,
-            0});
-            this.numDirectionY.Minimum = new decimal(new int[] {
-            360,
-            0,
-            0,
-            -2147483648});
-            this.numDirectionY.Name = "numDirectionY";
-            this.numDirectionY.Size = new System.Drawing.Size(60, 22);
-            this.numDirectionY.TabIndex = 13;
-            this.numDirectionY.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
-            this.toolTip.SetToolTip(this.numDirectionY, "Angle around the Y axis (horizontal rotation)");
-            this.numDirectionY.ValueChanged += new System.EventHandler(this.numDirectionY_ValueChanged);
-            // 
-            // toolTip
-            // 
-            this.toolTip.AutoPopDelay = 5000;
-            this.toolTip.InitialDelay = 500;
-            this.toolTip.ReshowDelay = 100;
-            // 
-            // cbLightIsUsedForImportedGeometry
-            // 
-            this.cbLightIsUsedForImportedGeometry.Enabled = false;
-            this.cbLightIsUsedForImportedGeometry.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cbLightIsUsedForImportedGeometry.Location = new System.Drawing.Point(79, 119);
-            this.cbLightIsUsedForImportedGeometry.Name = "cbLightIsUsedForImportedGeometry";
-            this.cbLightIsUsedForImportedGeometry.Size = new System.Drawing.Size(70, 22);
-            this.cbLightIsUsedForImportedGeometry.TabIndex = 19;
-            this.cbLightIsUsedForImportedGeometry.Text = "Imported";
-            this.toolTip.SetToolTip(this.cbLightIsUsedForImportedGeometry, "Use light for imported geometry");
-            this.cbLightIsUsedForImportedGeometry.CheckedChanged += new System.EventHandler(this.cbLightIsUsedForImportedGeometry_CheckedChanged);
-            // 
-            // cmbLightQuality
-            // 
-            this.cmbLightQuality.Enabled = false;
-            this.cmbLightQuality.Items.AddRange(new object[] {
-            "Default quality",
-            "Low quality",
-            "Medium quality",
-            "High quality"});
-            this.cmbLightQuality.Location = new System.Drawing.Point(3, 57);
-            this.cmbLightQuality.Name = "cmbLightQuality";
-            this.cmbLightQuality.Size = new System.Drawing.Size(143, 23);
-            this.cmbLightQuality.TabIndex = 6;
-            this.toolTip.SetToolTip(this.cmbLightQuality, "Raytracing sample count.\r\nHigher value gives more smooth shadows on obstructed ar" +
-        "eas.");
-            this.cmbLightQuality.SelectionChangeCommitted += new System.EventHandler(this.cmbLightQualityChanged);
-            // 
-            // cmbLightTypes
-            // 
-            this.cmbLightTypes.Location = new System.Drawing.Point(3, 28);
-            this.cmbLightTypes.Name = "cmbLightTypes";
-            this.cmbLightTypes.Size = new System.Drawing.Size(114, 23);
-            this.cmbLightTypes.TabIndex = 81;
-            this.toolTip.SetToolTip(this.cmbLightTypes, "Light type to place");
-            this.cmbLightTypes.SelectedIndexChanged += new System.EventHandler(this.cmbLightTypes_SelectedIndexChanged);
-            // 
-            // cbLightCastsShadow
-            // 
-            this.cbLightCastsShadow.Enabled = false;
-            this.cbLightCastsShadow.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.cbLightCastsShadow.Location = new System.Drawing.Point(3, 119);
-            this.cbLightCastsShadow.Name = "cbLightCastsShadow";
-            this.cbLightCastsShadow.Size = new System.Drawing.Size(70, 22);
-            this.cbLightCastsShadow.TabIndex = 87;
-            this.cbLightCastsShadow.Text = "Shadow";
-            this.toolTip.SetToolTip(this.cbLightCastsShadow, "Determines whether this light can cast shadows");
-            this.cbLightCastsShadow.CheckedChanged += new System.EventHandler(this.cbLightCastsShadow_CheckedChanged);
-            // 
-            // darkLabel6
-            // 
-            this.darkLabel6.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.darkLabel6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(220)))), ((int)(((byte)(220)))));
-            this.darkLabel6.Location = new System.Drawing.Point(155, 26);
-            this.darkLabel6.Name = "darkLabel6";
-            this.darkLabel6.Size = new System.Drawing.Size(51, 22);
-            this.darkLabel6.TabIndex = 68;
-            this.darkLabel6.Text = "Color";
-            this.darkLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-            // 
-            // Lighting
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.cbLightCastsShadow);
-            this.Controls.Add(this.cmbLightTypes);
-            this.Controls.Add(this.cmbLightQuality);
-            this.Controls.Add(this.cbLightIsUsedForImportedGeometry);
-            this.Controls.Add(this.numDirectionY);
-            this.Controls.Add(this.numDirectionX);
-            this.Controls.Add(this.numOuterAngle);
-            this.Controls.Add(this.numInnerAngle);
-            this.Controls.Add(this.numOuterRange);
-            this.Controls.Add(this.numInnerRange);
-            this.Controls.Add(this.numIntensity);
-            this.Controls.Add(this.cbLightIsDynamicallyUsed);
-            this.Controls.Add(this.cbLightIsStaticallyUsed);
-            this.Controls.Add(this.cbLightIsObstructedByRoomGeometry);
-            this.Controls.Add(this.cbLightEnabled);
-            this.Controls.Add(this.panelLightColor);
-            this.Controls.Add(this.darkLabel12);
-            this.Controls.Add(this.darkLabel13);
-            this.Controls.Add(this.darkLabel11);
-            this.Controls.Add(this.darkLabel9);
-            this.Controls.Add(this.darkLabel10);
-            this.Controls.Add(this.darkLabel8);
-            this.Controls.Add(this.darkLabel7);
-            this.Controls.Add(this.darkLabel6);
-            this.Controls.Add(this.butAddLight);
-            this.DefaultDockArea = DarkUI.Docking.DarkDockArea.Bottom;
-            this.DockText = "Lighting";
-            this.MinimumSize = new System.Drawing.Size(371, 141);
-            this.Name = "Lighting";
-            this.SerializationKey = "Lighting";
-            this.Size = new System.Drawing.Size(371, 141);
-            ((System.ComponentModel.ISupportInitialize)(this.numIntensity)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numInnerRange)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numOuterRange)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numInnerAngle)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numOuterAngle)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numDirectionX)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numDirectionY)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private DarkUI.Controls.DarkCheckBox cbLightIsDynamicallyUsed;
-        private DarkUI.Controls.DarkCheckBox cbLightIsStaticallyUsed;
-        private DarkUI.Controls.DarkCheckBox cbLightIsObstructedByRoomGeometry;
-        private DarkUI.Controls.DarkCheckBox cbLightEnabled;
-        private DarkUI.Controls.DarkPanel panelLightColor;
-        private DarkUI.Controls.DarkLabel darkLabel12;
-        private DarkUI.Controls.DarkLabel darkLabel13;
-        private DarkUI.Controls.DarkLabel darkLabel11;
-        private DarkUI.Controls.DarkLabel darkLabel9;
-        private DarkUI.Controls.DarkLabel darkLabel10;
-        private DarkUI.Controls.DarkLabel darkLabel8;
-        private DarkUI.Controls.DarkLabel darkLabel7;
-        private DarkUI.Controls.DarkButton butAddLight;
-        private DarkUI.Controls.DarkNumericUpDown numIntensity;
-        private DarkUI.Controls.DarkNumericUpDown numInnerRange;
-        private DarkUI.Controls.DarkNumericUpDown numOuterRange;
-        private DarkUI.Controls.DarkNumericUpDown numInnerAngle;
-        private DarkUI.Controls.DarkNumericUpDown numOuterAngle;
-        private DarkUI.Controls.DarkNumericUpDown numDirectionX;
-        private DarkUI.Controls.DarkNumericUpDown numDirectionY;
-        private System.Windows.Forms.ToolTip toolTip;
-        private DarkUI.Controls.DarkCheckBox cbLightIsUsedForImportedGeometry;
-        private DarkUI.Controls.DarkComboBox cmbLightQuality;
-        private DarkUI.Controls.DarkComboBox cmbLightTypes;
-        private DarkUI.Controls.DarkCheckBox cbLightCastsShadow;
-        private DarkUI.Controls.DarkLabel darkLabel6;
-    }
-}
diff --git a/TombEditor/ToolWindows/Lighting.cs b/TombEditor/ToolWindows/Lighting.cs
deleted file mode 100644
index e0157da546..0000000000
--- a/TombEditor/ToolWindows/Lighting.cs
+++ /dev/null
@@ -1,270 +0,0 @@
-using DarkUI.Docking;
-using System;
-using System.Numerics;
-using System.Windows.Forms;
-using TombLib.LevelData;
-using TombLib.Utils;
-
-namespace TombEditor.ToolWindows
-{
-    public partial class Lighting : DarkToolWindow
-    {
-        private readonly Editor _editor;
-
-        public Lighting()
-        {
-            InitializeComponent();
-            CommandHandler.AssignCommandsToControls(Editor.Instance, this, toolTip);
-
-            foreach (LightType l in Enum.GetValues(typeof(LightType)))
-                cmbLightTypes.Items.Add(l.ToString().SplitCamelcase());
-
-            cmbLightQuality.SelectedIndex = cmbLightTypes.SelectedIndex = 0; // Reset index to default
-
-            _editor = Editor.Instance;
-            _editor.EditorEventRaised += EditorEventRaised;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-                _editor.EditorEventRaised -= EditorEventRaised;
-            if (disposing && components != null)
-                components.Dispose();
-            base.Dispose(disposing);
-        }
-
-        private void EditorEventRaised(IEditorEvent obj)
-        {
-
-            // Update light UI
-            if (obj is Editor.InitEvent ||
-                obj is Editor.GameVersionChangedEvent ||
-                obj is Editor.LevelChangedEvent ||
-                obj is Editor.ObjectChangedEvent ||
-                obj is Editor.SelectedObjectChangedEvent)
-            {
-                var isTEN = _editor.Level.Settings.GameVersion == TRVersion.Game.TombEngine;
-                var light = _editor.SelectedObject as LightInstance;
-
-                // Get light type
-                bool HasInRange = false;
-                bool HasOutRange = false;
-                bool HasInOutAngle = false;
-                bool HasDirection = false;
-                bool CanCastShadows = false;
-                bool CanCastDynamicShadows = false;
-                bool CanIlluminateGeometry = false;
-
-                cmbLightQuality.Enabled = false;
-
-                if (light != null)
-                    switch (light.Type)
-                    {
-                        case LightType.Point:
-                            HasInRange = true;
-                            HasOutRange = true;
-                            CanIlluminateGeometry = true;
-                            CanCastShadows = true;
-                            CanCastDynamicShadows = isTEN;
-                            break;
-
-                        case LightType.Shadow:
-                            HasInRange = true;
-                            HasOutRange = true;
-                            CanCastShadows = true;
-                            CanIlluminateGeometry = true;
-                            break;
-
-                        case LightType.Effect:
-                            HasInRange = true;
-                            HasOutRange = true;
-                            break;
-
-                        case LightType.FogBulb:
-                            HasOutRange = true;
-                            break;
-
-                        case LightType.Spot:
-                            HasInRange = true;
-                            HasOutRange = true;
-                            HasInOutAngle = true;
-                            HasDirection = true;
-                            CanIlluminateGeometry = true;
-                            CanCastShadows = true;
-                            CanCastDynamicShadows = isTEN;
-                            break;
-
-                        case LightType.Sun:
-                            HasDirection = true;
-                            CanCastShadows = true;
-                            CanIlluminateGeometry = true;
-                            break;
-                    }
-
-                // Update enable state
-                // We set it before the values to make sure that irrelevant values are
-                // not recognized as being changed to 0 in the "ValueChanged" functions.
-                panelLightColor.Enabled = light != null;
-                cbLightEnabled.Enabled = light != null;
-                cbLightIsObstructedByRoomGeometry.Enabled = CanCastShadows;
-                cbLightCastsShadow.Enabled = CanCastDynamicShadows;
-                cbLightIsDynamicallyUsed.Enabled = CanIlluminateGeometry;
-                cbLightIsStaticallyUsed.Enabled = CanIlluminateGeometry;
-                cbLightIsUsedForImportedGeometry.Enabled = CanIlluminateGeometry;
-                numIntensity.Enabled = light != null;
-                numInnerRange.Enabled = HasInRange;
-                numOuterRange.Enabled = HasOutRange;
-                numInnerAngle.Enabled = HasInOutAngle;
-                numOuterAngle.Enabled = HasInOutAngle;
-                numDirectionY.Enabled = HasDirection;
-                numDirectionX.Enabled = HasDirection;
-
-                // Update value state
-                panelLightColor.BackColor = light != null ? new Vector4(light.Color * 0.5f, 1.0f).ToWinFormsColor() : BackColor;
-                numIntensity.Value = (decimal)(light?.Intensity ?? 0);
-                numInnerRange.Value = HasInRange ? (decimal)light.InnerRange : 0;
-                numOuterRange.Value = HasOutRange ? (decimal)light.OuterRange : 0;
-                numInnerAngle.Value = HasInOutAngle ? (decimal)light.InnerAngle : 0;
-                numOuterAngle.Value = HasInOutAngle ? (decimal)light.OuterAngle : 0;
-                numDirectionY.Value = HasDirection ? (decimal)light.RotationY : 0;
-                numDirectionX.Value = HasDirection ? (decimal)light.RotationX : 0;
-
-                cbLightEnabled.Checked = light?.Enabled ?? false;
-                cbLightIsObstructedByRoomGeometry.Checked = light?.IsObstructedByRoomGeometry ?? false;
-                cbLightIsDynamicallyUsed.Checked = light?.IsDynamicallyUsed ?? false;
-                cbLightIsStaticallyUsed.Checked = light?.IsStaticallyUsed ?? false;
-                cbLightIsUsedForImportedGeometry.Checked = light?.IsUsedForImportedGeometry ?? false;
-                cbLightCastsShadow.Checked = light?.CastDynamicShadows ?? false;
-                cmbLightQuality.Enabled = light != null;
-                cmbLightQuality.SelectedIndex = (int)(light?.Quality ?? 0);
-                cmbLightTypes.SelectedIndex = (int)(light?.Type ?? (LightType)cmbLightTypes.SelectedIndex);
-            }
-
-            // Update tooltip texts
-            if (obj is Editor.ConfigurationChangedEvent)
-            {
-                if (((Editor.ConfigurationChangedEvent)obj).UpdateKeyboardShortcuts)
-                    CommandHandler.AssignCommandsToControls(_editor, this, toolTip, true);
-            }
-        }
-
-        private void cbLightEnabled_CheckedChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<bool>((light, value) => light.Enabled == value, (light, value) => light.Enabled = value,
-                light => cbLightEnabled.Checked);
-        }
-
-        private void cbLightIsObstructedByRoomGeometry_CheckedChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<bool>((light, value) => light.IsObstructedByRoomGeometry == value, (light, value) => light.IsObstructedByRoomGeometry = value,
-                light => cbLightIsObstructedByRoomGeometry.Checked);
-        }
-
-        private void cbLightIsStaticallyUsed_CheckedChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<bool>((light, value) => light.IsStaticallyUsed == value, (light, value) => light.IsStaticallyUsed = value,
-                light => cbLightIsStaticallyUsed.Checked);
-        }
-
-        private void cbLightIsDynamicallyUsed_CheckedChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<bool>((light, value) => light.IsDynamicallyUsed == value, (light, value) => light.IsDynamicallyUsed = value,
-                light => cbLightIsDynamicallyUsed.Checked);
-        }
-
-        private void cbLightIsUsedForImportedGeometry_CheckedChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<bool>((light, value) => light.IsUsedForImportedGeometry == value, (light, value) => light.IsUsedForImportedGeometry = value,
-                light => cbLightIsUsedForImportedGeometry.Checked);
-        }
-
-        private void cbLightCastsShadow_CheckedChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<bool>((light, value) => light.CastDynamicShadows == value, (light, value) => light.CastDynamicShadows = value,
-                light => cbLightCastsShadow.Checked);
-        }
-
-        private static bool Compare(float firstValue, float secondValue, NumericUpDown control)
-        {
-            // Check that this setting even matters for the light...
-            if (!control.Enabled)
-                return true;
-
-            // Check if the value differs enough to warrant changing it
-            // We don't want to polute the editor with useless event's because NumericUpDown
-            // decided to round.
-            for (int i = 0; i < control.DecimalPlaces; ++i)
-            {
-                firstValue *= 10.0f;
-                secondValue *= 10.0f;
-            }
-
-            double firstValueDbl = Math.Round(firstValue);
-            double secondValueDbl = Math.Round(secondValue);
-            return firstValueDbl == secondValueDbl;
-        }
-
-        private void numIntensity_ValueChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<float>((light, value) => Compare(light.Intensity, value, numIntensity),
-                (light, value) => light.Intensity = value, light => (float)numIntensity.Value);
-        }
-
-        private void numInnerRange_ValueChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<float>((light, value) => Compare(light.InnerRange, value, numInnerRange),
-                (light, value) => light.InnerRange = value, light => (float)numInnerRange.Value);
-        }
-
-        private void numOuterRange_ValueChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<float>((light, value) => Compare(light.OuterRange, value, numOuterRange),
-                (light, value) => light.OuterRange = value, light => (float)numOuterRange.Value);
-        }
-
-        private void numInnerAngle_ValueChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<float>((light, value) => Compare(light.InnerAngle, value, numInnerAngle),
-                 (light, value) => light.InnerAngle = value, light => (float)numInnerAngle.Value);
-        }
-
-        private void numOuterAngle_ValueChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<float>((light, value) => Compare(light.OuterAngle, value, numOuterAngle),
-                 (light, value) => light.OuterAngle = value, light => (float)numOuterAngle.Value);
-        }
-
-        private void numDirectionY_ValueChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<float>((light, value) => Compare(light.RotationY, value, numDirectionY),
-                 (light, value) => light.RotationY = value, light => (float)numDirectionY.Value);
-        }
-
-        private void numDirectionX_ValueChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLight<float>((light, value) => Compare(light.RotationX, value, numDirectionX),
-                 (light, value) => light.RotationX = value, light => (float)numDirectionX.Value);
-        }
-
-        private void panelLightColor_Click(object sender, EventArgs e)
-        {
-            EditorActions.EditLightColor(this);
-        }
-
-        private void cmbLightQualityChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLightQuality((LightQuality)cmbLightQuality.SelectedIndex);
-        }
-
-        private void butAddLight_Click(object sender, EventArgs e)
-        {
-            EditorActions.PlaceLight((LightType)cmbLightTypes.SelectedIndex);
-        }
-
-        private void cmbLightTypes_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            EditorActions.UpdateLightType((LightType)cmbLightTypes.SelectedIndex);
-        }
-    }
-}
diff --git a/TombEditor/ToolWindows/MainView.Designer.cs b/TombEditor/ToolWindows/MainView.Designer.cs
index 37347947bc..d2311f4e7c 100644
--- a/TombEditor/ToolWindows/MainView.Designer.cs
+++ b/TombEditor/ToolWindows/MainView.Designer.cs
@@ -87,7 +87,7 @@ private void InitializeComponent()
 			comboStepHeight = new DarkUI.Controls.DarkComboBox();
 			panelFlybyTimeline = new System.Windows.Forms.Panel();
 			flybyTimelineHost = new System.Windows.Forms.Integration.ElementHost();
-			flybyTimelineView = new Controls.FlybyTimeline.UI.FlybyTimelineView();
+			flybyTimelineView = new Features.FlybyTimeline.UI.FlybyTimelineView();
 			panelMainView = new System.Windows.Forms.Panel();
 			toolTip = new System.Windows.Forms.ToolTip(components);
 			butMirror = new System.Windows.Forms.ToolStripButton();
@@ -1011,7 +1011,7 @@ private void InitializeComponent()
         private DarkUI.Controls.DarkComboBox comboStepHeight;
         private System.Windows.Forms.Panel panelFlybyTimeline;
         private System.Windows.Forms.Integration.ElementHost flybyTimelineHost;
-        private Controls.FlybyTimeline.UI.FlybyTimelineView flybyTimelineView;
+        private Features.FlybyTimeline.UI.FlybyTimelineView flybyTimelineView;
 		private System.Windows.Forms.ToolStripButton butMirror;
 	}
 }
diff --git a/TombEditor/ToolWindows/Palette.Designer.cs b/TombEditor/ToolWindows/Palette.Designer.cs
deleted file mode 100644
index d4c9975bd7..0000000000
--- a/TombEditor/ToolWindows/Palette.Designer.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-namespace TombEditor.ToolWindows
-{
-    partial class Palette
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.paletteToolBar = new System.Windows.Forms.FlowLayoutPanel();
-            this.butResetToDefaults = new DarkUI.Controls.DarkButton();
-            this.butSampleFromTextures = new DarkUI.Controls.DarkButton();
-            this.butEditColor = new DarkUI.Controls.DarkButton();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.lightPalette = new TombEditor.Controls.PanelPalette();
-            this.paletteToolBar.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.lightPalette)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // paletteToolBar
-            // 
-            this.paletteToolBar.AutoSize = true;
-            this.paletteToolBar.Controls.Add(this.butResetToDefaults);
-            this.paletteToolBar.Controls.Add(this.butSampleFromTextures);
-            this.paletteToolBar.Controls.Add(this.butEditColor);
-            this.paletteToolBar.Dock = System.Windows.Forms.DockStyle.Left;
-            this.paletteToolBar.Location = new System.Drawing.Point(0, 25);
-            this.paletteToolBar.Name = "paletteToolBar";
-            this.paletteToolBar.Size = new System.Drawing.Size(29, 116);
-            this.paletteToolBar.TabIndex = 84;
-            // 
-            // butResetToDefaults
-            // 
-            this.butResetToDefaults.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.butResetToDefaults.Checked = false;
-            this.butResetToDefaults.Image = global::TombEditor.Properties.Resources.actions_refresh_16;
-            this.butResetToDefaults.Location = new System.Drawing.Point(3, 3);
-            this.butResetToDefaults.Name = "butResetToDefaults";
-            this.butResetToDefaults.Size = new System.Drawing.Size(23, 23);
-            this.butResetToDefaults.TabIndex = 5;
-            this.butResetToDefaults.Tag = "ResetPalette";
-            // 
-            // butSampleFromTextures
-            // 
-            this.butSampleFromTextures.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.butSampleFromTextures.Checked = false;
-            this.butSampleFromTextures.Image = global::TombEditor.Properties.Resources.actions_TextureMode_16;
-            this.butSampleFromTextures.Location = new System.Drawing.Point(3, 32);
-            this.butSampleFromTextures.Name = "butSampleFromTextures";
-            this.butSampleFromTextures.Size = new System.Drawing.Size(23, 23);
-            this.butSampleFromTextures.TabIndex = 6;
-            this.butSampleFromTextures.Tag = "SamplePaletteFromTextures";
-            // 
-            // butEditColor
-            // 
-            this.butEditColor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.butEditColor.Checked = false;
-            this.butEditColor.Enabled = false;
-            this.butEditColor.Image = global::TombEditor.Properties.Resources.general_edit_16;
-            this.butEditColor.Location = new System.Drawing.Point(3, 61);
-            this.butEditColor.Name = "butEditColor";
-            this.butEditColor.Size = new System.Drawing.Size(23, 23);
-            this.butEditColor.TabIndex = 7;
-            this.butEditColor.Tag = "EditObjectColor";
-            this.toolTip.SetToolTip(this.butEditColor, "Edit color for selected object");
-            // 
-            // lightPalette
-            // 
-            this.lightPalette.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lightPalette.Editable = true;
-            this.lightPalette.Location = new System.Drawing.Point(29, 25);
-            this.lightPalette.Margin = new System.Windows.Forms.Padding(2);
-            this.lightPalette.Name = "lightPalette";
-            this.lightPalette.Padding = new System.Windows.Forms.Padding(3);
-            this.lightPalette.Size = new System.Drawing.Size(616, 116);
-            this.lightPalette.TabIndex = 82;
-            this.lightPalette.TabStop = false;
-            // 
-            // Palette
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.lightPalette);
-            this.Controls.Add(this.paletteToolBar);
-            this.DefaultDockArea = DarkUI.Docking.DarkDockArea.Bottom;
-            this.DockText = "Palette";
-            this.MinimumSize = new System.Drawing.Size(100, 100);
-            this.Name = "Palette";
-            this.SerializationKey = "Palette";
-            this.Size = new System.Drawing.Size(645, 141);
-            this.paletteToolBar.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.lightPalette)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Controls.PanelPalette lightPalette;
-        private DarkUI.Controls.DarkButton butSampleFromTextures;
-        private DarkUI.Controls.DarkButton butResetToDefaults;
-        private System.Windows.Forms.FlowLayoutPanel paletteToolBar;
-        private System.Windows.Forms.ToolTip toolTip;
-        private DarkUI.Controls.DarkButton butEditColor;
-    }
-}
diff --git a/TombEditor/ToolWindows/Palette.cs b/TombEditor/ToolWindows/Palette.cs
deleted file mode 100644
index 358e337130..0000000000
--- a/TombEditor/ToolWindows/Palette.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using DarkUI.Docking;
-using TombLib.LevelData;
-using TombLib.Utils;
-
-namespace TombEditor.ToolWindows
-{
-    public partial class Palette : DarkToolWindow
-    {
-        private readonly Editor _editor;
-        private List<ColorC> _lastTexturePalette;
-
-        public Palette()
-        {
-            InitializeComponent();
-
-            CommandHandler.AssignCommandsToControls(Editor.Instance, this, toolTip);
-            _editor = Editor.Instance;
-            _editor.EditorEventRaised += EditorEventRaised;
-
-            // Reset palette to default and prepare controls
-            lightPalette.LoadPalette(LevelSettings.LoadPalette());
-            UpdateControls(false);
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-                _editor.EditorEventRaised -= EditorEventRaised;
-            if (disposing && components != null)
-                components.Dispose();
-            base.Dispose(disposing);
-        }
-
-        private void EditorEventRaised(IEditorEvent obj)
-        {
-            if (obj is Editor.LevelChangedEvent)
-            {
-                _lastTexturePalette = null;
-                lightPalette.LoadPalette(((Editor.LevelChangedEvent)obj).Current.Settings.Palette);
-            }
-
-            if (obj is Editor.SelectedObjectChangedEvent)
-            {
-                butEditColor.Enabled = ((Editor.SelectedObjectChangedEvent)obj).Current.CanBeColored();
-                lightPalette.PickColor();
-            }
-
-            if (obj is Editor.ObjectChangedEvent)
-            {
-                var o = obj as Editor.ObjectChangedEvent;
-                if (o.ChangeType == ObjectChangeType.Change && o.Object == _editor.SelectedObject && o.Object is IColorable)
-                    lightPalette.PickColor();
-            }
-
-            if (obj is Editor.ResetPaletteEvent)
-            {
-                if (!butSampleFromTextures.Checked)
-                {
-                    lightPalette.LoadPalette(LevelSettings.LoadPalette());
-                    _editor.Level.Settings.Palette = lightPalette.Palette;
-                }
-            }
-
-            if (obj is Editor.SelectedLevelTextureChangedSetEvent)
-            {
-                var o = (Editor.SelectedLevelTextureChangedSetEvent)obj;
-                _lastTexturePalette = new List<ColorC>(o.Texture.Image.Palette);
-                UpdateControls();
-            }
-
-            if (obj is Editor.ConfigurationChangedEvent)
-            {
-                var o = (Editor.ConfigurationChangedEvent)obj;
-                if (((Editor.ConfigurationChangedEvent)obj).UpdateKeyboardShortcuts)
-                    CommandHandler.AssignCommandsToControls(_editor, this, toolTip, true);
-                UpdateControls();
-            }
-        }
-
-        private void UpdateControls(bool reloadPalette = true)
-        {
-            bool useTexture = _editor.Configuration.Palette_TextureSamplingMode;
-
-            butSampleFromTextures.Checked =  useTexture;
-            butResetToDefaults.Enabled    = !useTexture;
-            lightPalette.Editable         = !useTexture;
-
-            if (reloadPalette)
-            {
-                if (useTexture && _lastTexturePalette != null && _lastTexturePalette.Count > 0)
-                    lightPalette.LoadPalette(_lastTexturePalette);
-                else
-                    lightPalette.LoadPalette(_editor.Level.Settings.Palette);
-
-                // Also update last colour on editor so next created light will receive updated colour.
-                _editor.LastUsedPaletteColourChange(lightPalette.SelectedColor);
-            }
-        }
-
-        protected override void OnSizeChanged(EventArgs e)
-        {
-            base.OnSizeChanged(e);
-
-            if (ClientSize.Width >= ClientSize.Height * 2)
-                paletteToolBar.Dock = System.Windows.Forms.DockStyle.Left;
-            else
-                paletteToolBar.Dock = System.Windows.Forms.DockStyle.Top;
-        }
-    }
-}
diff --git a/TombEditor/ToolWindows/RoomOptions.Designer.cs b/TombEditor/ToolWindows/RoomOptions.Designer.cs
deleted file mode 100644
index 56603217de..0000000000
--- a/TombEditor/ToolWindows/RoomOptions.Designer.cs
+++ /dev/null
@@ -1,532 +0,0 @@
-namespace TombEditor.ToolWindows
-{
-    partial class RoomOptions
-    {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-            cbNoPathfinding = new DarkUI.Controls.DarkCheckBox();
-            cbHorizon = new DarkUI.Controls.DarkCheckBox();
-            darkLabel19 = new DarkUI.Controls.DarkLabel();
-            darkLabel18 = new DarkUI.Controls.DarkLabel();
-            darkLabel16 = new DarkUI.Controls.DarkLabel();
-            cbFlagOutside = new DarkUI.Controls.DarkCheckBox();
-            cbFlagCold = new DarkUI.Controls.DarkCheckBox();
-            cbFlagDamage = new DarkUI.Controls.DarkCheckBox();
-            darkLabel15 = new DarkUI.Controls.DarkLabel();
-            panelRoomAmbientLight = new DarkUI.Controls.DarkPanel();
-            darkLabel3 = new DarkUI.Controls.DarkLabel();
-            cbNoLensflare = new DarkUI.Controls.DarkCheckBox();
-            toolTip = new System.Windows.Forms.ToolTip(components);
-            numLightEffectStrength = new DarkUI.Controls.DarkNumericUpDown();
-            comboPortalShade = new DarkUI.Controls.DarkComboBox();
-            comboLightEffect = new DarkUI.Controls.DarkComboBox();
-            tbRoomTags = new TombLib.Controls.DarkAutocompleteTextBox();
-            darkLabel2 = new DarkUI.Controls.DarkLabel();
-            darkLabel1 = new DarkUI.Controls.DarkLabel();
-            butSelectPreviousRoom = new DarkUI.Controls.DarkButton();
-            butNewRoom = new DarkUI.Controls.DarkButton();
-            butDeleteRoom = new DarkUI.Controls.DarkButton();
-            butDublicateRoom = new DarkUI.Controls.DarkButton();
-            butLocked = new DarkUI.Controls.DarkButton();
-            comboFlipMap = new DarkUI.Controls.DarkComboBox();
-            butRoomUp = new DarkUI.Controls.DarkButton();
-            comboReverberation = new DarkUI.Controls.DarkComboBox();
-            comboRoomType = new DarkUI.Controls.DarkComboBox();
-            comboRoom = new TombLib.Controls.DarkSearchableComboBox();
-            butRoomDown = new DarkUI.Controls.DarkButton();
-            butEditRoomName = new DarkUI.Controls.DarkButton();
-            butCropRoom = new DarkUI.Controls.DarkButton();
-            butSplitRoom = new DarkUI.Controls.DarkButton();
-            butHidden = new DarkUI.Controls.DarkButton();
-            cbFlagNoCaustics = new DarkUI.Controls.DarkCheckBox();
-            ((System.ComponentModel.ISupportInitialize)numLightEffectStrength).BeginInit();
-            SuspendLayout();
-            // 
-            // cbNoPathfinding
-            // 
-            cbNoPathfinding.AutoCheck = false;
-            cbNoPathfinding.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            cbNoPathfinding.Location = new System.Drawing.Point(129, 130);
-            cbNoPathfinding.Name = "cbNoPathfinding";
-            cbNoPathfinding.Size = new System.Drawing.Size(96, 17);
-            cbNoPathfinding.TabIndex = 8;
-            cbNoPathfinding.Tag = "SetRoomNoPathfinding";
-            cbNoPathfinding.Text = "No pathfinding";
-            // 
-            // cbHorizon
-            // 
-            cbHorizon.AutoCheck = false;
-            cbHorizon.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            cbHorizon.Location = new System.Drawing.Point(3, 130);
-            cbHorizon.Name = "cbHorizon";
-            cbHorizon.Size = new System.Drawing.Size(58, 17);
-            cbHorizon.TabIndex = 6;
-            cbHorizon.Tag = "SetRoomSkybox";
-            cbHorizon.Text = "Skybox";
-            // 
-            // darkLabel19
-            // 
-            darkLabel19.AutoSize = true;
-            darkLabel19.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            darkLabel19.ForeColor = System.Drawing.Color.FromArgb(220, 220, 220);
-            darkLabel19.Location = new System.Drawing.Point(87, 84);
-            darkLabel19.Name = "darkLabel19";
-            darkLabel19.Size = new System.Drawing.Size(48, 13);
-            darkLabel19.TabIndex = 103;
-            darkLabel19.Text = "Flipmap";
-            // 
-            // darkLabel18
-            // 
-            darkLabel18.AutoSize = true;
-            darkLabel18.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            darkLabel18.ForeColor = System.Drawing.Color.FromArgb(220, 220, 220);
-            darkLabel18.Location = new System.Drawing.Point(148, 84);
-            darkLabel18.Name = "darkLabel18";
-            darkLabel18.Size = new System.Drawing.Size(42, 13);
-            darkLabel18.TabIndex = 100;
-            darkLabel18.Text = "Reverb";
-            // 
-            // darkLabel16
-            // 
-            darkLabel16.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
-            darkLabel16.AutoSize = true;
-            darkLabel16.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            darkLabel16.ForeColor = System.Drawing.Color.FromArgb(220, 220, 220);
-            darkLabel16.Location = new System.Drawing.Point(140, 194);
-            darkLabel16.Name = "darkLabel16";
-            darkLabel16.Size = new System.Drawing.Size(36, 13);
-            darkLabel16.TabIndex = 96;
-            darkLabel16.Text = "Effect";
-            // 
-            // cbFlagOutside
-            // 
-            cbFlagOutside.AutoCheck = false;
-            cbFlagOutside.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            cbFlagOutside.Location = new System.Drawing.Point(3, 150);
-            cbFlagOutside.Name = "cbFlagOutside";
-            cbFlagOutside.Size = new System.Drawing.Size(50, 17);
-            cbFlagOutside.TabIndex = 9;
-            cbFlagOutside.Tag = "SetRoomOutside";
-            cbFlagOutside.Text = "Wind";
-            // 
-            // cbFlagCold
-            // 
-            cbFlagCold.AutoCheck = false;
-            cbFlagCold.AutoSize = true;
-            cbFlagCold.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            cbFlagCold.Location = new System.Drawing.Point(64, 150);
-            cbFlagCold.Name = "cbFlagCold";
-            cbFlagCold.Size = new System.Drawing.Size(50, 17);
-            cbFlagCold.TabIndex = 10;
-            cbFlagCold.Tag = "SetRoomCold";
-            cbFlagCold.Text = "Cold";
-            // 
-            // cbFlagDamage
-            // 
-            cbFlagDamage.AutoCheck = false;
-            cbFlagDamage.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            cbFlagDamage.Location = new System.Drawing.Point(64, 130);
-            cbFlagDamage.Name = "cbFlagDamage";
-            cbFlagDamage.Size = new System.Drawing.Size(64, 17);
-            cbFlagDamage.TabIndex = 7;
-            cbFlagDamage.Tag = "SetRoomDamage";
-            cbFlagDamage.Text = "Damage";
-            // 
-            // darkLabel15
-            // 
-            darkLabel15.AutoSize = true;
-            darkLabel15.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            darkLabel15.ForeColor = System.Drawing.Color.FromArgb(220, 220, 220);
-            darkLabel15.Location = new System.Drawing.Point(0, 84);
-            darkLabel15.Name = "darkLabel15";
-            darkLabel15.Size = new System.Drawing.Size(62, 13);
-            darkLabel15.TabIndex = 91;
-            darkLabel15.Text = "Room type";
-            // 
-            // panelRoomAmbientLight
-            // 
-            panelRoomAmbientLight.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
-            panelRoomAmbientLight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            panelRoomAmbientLight.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            panelRoomAmbientLight.Location = new System.Drawing.Point(3, 210);
-            panelRoomAmbientLight.Name = "panelRoomAmbientLight";
-            panelRoomAmbientLight.Size = new System.Drawing.Size(59, 23);
-            panelRoomAmbientLight.TabIndex = 12;
-            panelRoomAmbientLight.Tag = "EditAmbientLight";
-            // 
-            // darkLabel3
-            // 
-            darkLabel3.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
-            darkLabel3.AutoSize = true;
-            darkLabel3.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            darkLabel3.ForeColor = System.Drawing.Color.FromArgb(220, 220, 220);
-            darkLabel3.Location = new System.Drawing.Point(0, 194);
-            darkLabel3.Name = "darkLabel3";
-            darkLabel3.Size = new System.Drawing.Size(50, 13);
-            darkLabel3.TabIndex = 88;
-            darkLabel3.Text = "Ambient";
-            // 
-            // cbNoLensflare
-            // 
-            cbNoLensflare.AutoCheck = false;
-            cbNoLensflare.AutoSize = true;
-            cbNoLensflare.Location = new System.Drawing.Point(129, 150);
-            cbNoLensflare.Name = "cbNoLensflare";
-            cbNoLensflare.Size = new System.Drawing.Size(88, 17);
-            cbNoLensflare.TabIndex = 11;
-            cbNoLensflare.Tag = "SetRoomNoLensflare";
-            cbNoLensflare.Text = "No lensflare";
-            // 
-            // toolTip
-            // 
-            toolTip.AutoPopDelay = 5000;
-            toolTip.InitialDelay = 500;
-            toolTip.ReshowDelay = 100;
-            // 
-            // numLightEffectStrength
-            // 
-            numLightEffectStrength.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
-            numLightEffectStrength.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            numLightEffectStrength.IncrementAlternate = new decimal(new int[] { 10, 0, 0, 65536 });
-            numLightEffectStrength.Location = new System.Drawing.Point(246, 210);
-            numLightEffectStrength.LoopValues = false;
-            numLightEffectStrength.Maximum = new decimal(new int[] { 4, 0, 0, 0 });
-            numLightEffectStrength.Name = "numLightEffectStrength";
-            numLightEffectStrength.Size = new System.Drawing.Size(36, 23);
-            numLightEffectStrength.TabIndex = 15;
-            numLightEffectStrength.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            toolTip.SetToolTip(numLightEffectStrength, "Light / transform effect strength");
-            numLightEffectStrength.Value = new decimal(new int[] { 1, 0, 0, 0 });
-            numLightEffectStrength.ValueChanged += numLightEffectStrength_ValueChanged;
-            // 
-            // comboPortalShade
-            // 
-            comboPortalShade.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
-            comboPortalShade.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            comboPortalShade.Items.AddRange(new object[] { "Default", "Smooth", "Sharp" });
-            comboPortalShade.Location = new System.Drawing.Point(68, 210);
-            comboPortalShade.Name = "comboPortalShade";
-            comboPortalShade.Size = new System.Drawing.Size(69, 23);
-            comboPortalShade.TabIndex = 13;
-            toolTip.SetToolTip(comboPortalShade, "Smoothing on room edges");
-            comboPortalShade.SelectedIndexChanged += comboPortalShade_SelectedIndexChanged;
-            // 
-            // comboLightEffect
-            // 
-            comboLightEffect.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-            comboLightEffect.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            comboLightEffect.Items.AddRange(new object[] { "None", "Default", "Reflection", "Glow", "Move", "Glow & Move", "Mist" });
-            comboLightEffect.Location = new System.Drawing.Point(143, 210);
-            comboLightEffect.Name = "comboLightEffect";
-            comboLightEffect.Size = new System.Drawing.Size(97, 23);
-            comboLightEffect.TabIndex = 14;
-            toolTip.SetToolTip(comboLightEffect, "Light / transform effect on room vertices");
-            comboLightEffect.SelectedIndexChanged += comboLightEffect_SelectedIndexChanged;
-            // 
-            // tbRoomTags
-            // 
-            tbRoomTags.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-            tbRoomTags.CharacterCasing = System.Windows.Forms.CharacterCasing.Lower;
-            tbRoomTags.Location = new System.Drawing.Point(39, 57);
-            tbRoomTags.Name = "tbRoomTags";
-            tbRoomTags.Size = new System.Drawing.Size(183, 22);
-            tbRoomTags.TabIndex = 2;
-            tbRoomTags.Tag = "SetRoomTags";
-            toolTip.SetToolTip(tbRoomTags, "Set room tags, separated by spaces");
-            tbRoomTags.TextChanged += TbTags_TextChanged;
-            // 
-            // darkLabel2
-            // 
-            darkLabel2.AutoSize = true;
-            darkLabel2.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            darkLabel2.ForeColor = System.Drawing.Color.FromArgb(220, 220, 220);
-            darkLabel2.Location = new System.Drawing.Point(1, 59);
-            darkLabel2.Name = "darkLabel2";
-            darkLabel2.Size = new System.Drawing.Size(33, 13);
-            darkLabel2.TabIndex = 110;
-            darkLabel2.Text = "Tags:";
-            // 
-            // darkLabel1
-            // 
-            darkLabel1.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
-            darkLabel1.AutoSize = true;
-            darkLabel1.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            darkLabel1.ForeColor = System.Drawing.Color.FromArgb(220, 220, 220);
-            darkLabel1.Location = new System.Drawing.Point(65, 194);
-            darkLabel1.Name = "darkLabel1";
-            darkLabel1.Size = new System.Drawing.Size(71, 13);
-            darkLabel1.TabIndex = 112;
-            darkLabel1.Text = "Portal shade";
-            // 
-            // butSelectPreviousRoom
-            // 
-            butSelectPreviousRoom.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butSelectPreviousRoom.BackColor = System.Drawing.Color.FromArgb(128, 64, 64);
-            butSelectPreviousRoom.Checked = false;
-            butSelectPreviousRoom.Image = Properties.Resources.actions_back_16;
-            butSelectPreviousRoom.Location = new System.Drawing.Point(228, 144);
-            butSelectPreviousRoom.Name = "butSelectPreviousRoom";
-            butSelectPreviousRoom.Size = new System.Drawing.Size(24, 22);
-            butSelectPreviousRoom.TabIndex = 24;
-            butSelectPreviousRoom.Tag = "SelectPreviousRoom";
-            // 
-            // butNewRoom
-            // 
-            butNewRoom.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butNewRoom.Checked = false;
-            butNewRoom.Image = Properties.Resources.general_plus_math_16;
-            butNewRoom.Location = new System.Drawing.Point(258, 28);
-            butNewRoom.Name = "butNewRoom";
-            butNewRoom.Size = new System.Drawing.Size(24, 23);
-            butNewRoom.TabIndex = 17;
-            butNewRoom.Tag = "AddNewRoom";
-            // 
-            // butDeleteRoom
-            // 
-            butDeleteRoom.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butDeleteRoom.Checked = false;
-            butDeleteRoom.Image = Properties.Resources.general_trash_16;
-            butDeleteRoom.Location = new System.Drawing.Point(258, 57);
-            butDeleteRoom.Name = "butDeleteRoom";
-            butDeleteRoom.Size = new System.Drawing.Size(24, 23);
-            butDeleteRoom.TabIndex = 19;
-            butDeleteRoom.Tag = "DeleteRooms";
-            // 
-            // butDublicateRoom
-            // 
-            butDublicateRoom.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butDublicateRoom.Checked = false;
-            butDublicateRoom.Image = Properties.Resources.general_copy_16;
-            butDublicateRoom.Location = new System.Drawing.Point(228, 57);
-            butDublicateRoom.Name = "butDublicateRoom";
-            butDublicateRoom.Size = new System.Drawing.Size(24, 23);
-            butDublicateRoom.TabIndex = 18;
-            butDublicateRoom.Tag = "DuplicateRoom";
-            // 
-            // butLocked
-            // 
-            butLocked.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butLocked.Checked = false;
-            butLocked.Image = Properties.Resources.general_Lock_16;
-            butLocked.Location = new System.Drawing.Point(258, 144);
-            butLocked.Name = "butLocked";
-            butLocked.Size = new System.Drawing.Size(24, 22);
-            butLocked.TabIndex = 25;
-            butLocked.Tag = "LockRoom";
-            // 
-            // comboFlipMap
-            // 
-            comboFlipMap.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            comboFlipMap.Items.AddRange(new object[] { "None", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15" });
-            comboFlipMap.Location = new System.Drawing.Point(90, 100);
-            comboFlipMap.Name = "comboFlipMap";
-            comboFlipMap.Size = new System.Drawing.Size(55, 23);
-            comboFlipMap.TabIndex = 4;
-            comboFlipMap.SelectedIndexChanged += comboFlipMap_SelectedIndexChanged;
-            // 
-            // butRoomUp
-            // 
-            butRoomUp.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butRoomUp.Checked = false;
-            butRoomUp.Image = Properties.Resources.general_ArrowUp_16;
-            butRoomUp.Location = new System.Drawing.Point(258, 86);
-            butRoomUp.Name = "butRoomUp";
-            butRoomUp.Size = new System.Drawing.Size(24, 23);
-            butRoomUp.TabIndex = 21;
-            butRoomUp.Tag = "MoveRoomUp";
-            // 
-            // comboReverberation
-            // 
-            comboReverberation.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-            comboReverberation.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            comboReverberation.Items.AddRange(new object[] { "None", "Small", "Medium", "Large", "Pipe" });
-            comboReverberation.Location = new System.Drawing.Point(151, 100);
-            comboReverberation.Name = "comboReverberation";
-            comboReverberation.Size = new System.Drawing.Size(71, 23);
-            comboReverberation.TabIndex = 5;
-            comboReverberation.SelectedIndexChanged += comboReverberation_SelectedIndexChanged;
-            // 
-            // comboRoomType
-            // 
-            comboRoomType.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            comboRoomType.Location = new System.Drawing.Point(3, 100);
-            comboRoomType.Name = "comboRoomType";
-            comboRoomType.Size = new System.Drawing.Size(81, 23);
-            comboRoomType.TabIndex = 3;
-            comboRoomType.SelectedIndexChanged += comboRoomType_SelectedIndexChanged;
-            // 
-            // comboRoom
-            // 
-            comboRoom.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
-            comboRoom.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            comboRoom.Location = new System.Drawing.Point(3, 28);
-            comboRoom.Name = "comboRoom";
-            comboRoom.Size = new System.Drawing.Size(219, 23);
-            comboRoom.TabIndex = 0;
-            comboRoom.SelectedIndexChanged += comboRoom_SelectedIndexChanged;
-            // 
-            // butRoomDown
-            // 
-            butRoomDown.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butRoomDown.Checked = false;
-            butRoomDown.Image = Properties.Resources.general_ArrowDown_16;
-            butRoomDown.Location = new System.Drawing.Point(258, 115);
-            butRoomDown.Name = "butRoomDown";
-            butRoomDown.Size = new System.Drawing.Size(24, 23);
-            butRoomDown.TabIndex = 23;
-            butRoomDown.Tag = "MoveRoomDown";
-            // 
-            // butEditRoomName
-            // 
-            butEditRoomName.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butEditRoomName.Checked = false;
-            butEditRoomName.Image = Properties.Resources.general_edit_16;
-            butEditRoomName.Location = new System.Drawing.Point(228, 28);
-            butEditRoomName.Name = "butEditRoomName";
-            butEditRoomName.Size = new System.Drawing.Size(24, 23);
-            butEditRoomName.TabIndex = 16;
-            butEditRoomName.Tag = "EditRoomName";
-            // 
-            // butCropRoom
-            // 
-            butCropRoom.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butCropRoom.Checked = false;
-            butCropRoom.Image = Properties.Resources.general_crop_16;
-            butCropRoom.Location = new System.Drawing.Point(228, 86);
-            butCropRoom.Name = "butCropRoom";
-            butCropRoom.Size = new System.Drawing.Size(24, 23);
-            butCropRoom.TabIndex = 20;
-            butCropRoom.Tag = "CropRoom";
-            // 
-            // butSplitRoom
-            // 
-            butSplitRoom.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butSplitRoom.Checked = false;
-            butSplitRoom.Image = Properties.Resources.actions_Split_16;
-            butSplitRoom.Location = new System.Drawing.Point(228, 115);
-            butSplitRoom.Name = "butSplitRoom";
-            butSplitRoom.Size = new System.Drawing.Size(24, 23);
-            butSplitRoom.TabIndex = 22;
-            butSplitRoom.Tag = "SplitRoom";
-            // 
-            // butHidden
-            // 
-            butHidden.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
-            butHidden.Checked = false;
-            butHidden.Image = Properties.Resources.toolbox_Invisible_16;
-            butHidden.Location = new System.Drawing.Point(228, 172);
-            butHidden.Name = "butHidden";
-            butHidden.Size = new System.Drawing.Size(54, 22);
-            butHidden.TabIndex = 26;
-            butHidden.Tag = "HideRoom";
-            // 
-            // cbFlagNoCaustics
-            // 
-            cbFlagNoCaustics.AutoCheck = false;
-            cbFlagNoCaustics.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            cbFlagNoCaustics.Location = new System.Drawing.Point(129, 165);
-            cbFlagNoCaustics.Name = "cbFlagNoCaustics";
-            cbFlagNoCaustics.Size = new System.Drawing.Size(81, 26);
-            cbFlagNoCaustics.TabIndex = 113;
-            cbFlagNoCaustics.Tag = "SetRoomNoCaustics";
-            cbFlagNoCaustics.Text = "No caustics";
-            // 
-            // RoomOptions
-            // 
-            AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            Controls.Add(cbFlagCold);
-            Controls.Add(cbFlagNoCaustics);
-            Controls.Add(butHidden);
-            Controls.Add(butSelectPreviousRoom);
-            Controls.Add(comboPortalShade);
-            Controls.Add(darkLabel1);
-            Controls.Add(butNewRoom);
-            Controls.Add(darkLabel2);
-            Controls.Add(tbRoomTags);
-            Controls.Add(numLightEffectStrength);
-            Controls.Add(butDeleteRoom);
-            Controls.Add(butDublicateRoom);
-            Controls.Add(butLocked);
-            Controls.Add(cbNoLensflare);
-            Controls.Add(cbNoPathfinding);
-            Controls.Add(cbHorizon);
-            Controls.Add(comboFlipMap);
-            Controls.Add(darkLabel19);
-            Controls.Add(butRoomUp);
-            Controls.Add(comboReverberation);
-            Controls.Add(darkLabel18);
-            Controls.Add(comboLightEffect);
-            Controls.Add(darkLabel16);
-            Controls.Add(cbFlagOutside);
-            Controls.Add(cbFlagDamage);
-            Controls.Add(comboRoomType);
-            Controls.Add(darkLabel15);
-            Controls.Add(comboRoom);
-            Controls.Add(panelRoomAmbientLight);
-            Controls.Add(darkLabel3);
-            Controls.Add(butRoomDown);
-            Controls.Add(butEditRoomName);
-            Controls.Add(butCropRoom);
-            Controls.Add(butSplitRoom);
-            DockText = "Room Options";
-            MinimumSize = new System.Drawing.Size(284, 236);
-            Name = "RoomOptions";
-            SerializationKey = "RoomOptions";
-            Size = new System.Drawing.Size(284, 236);
-            ((System.ComponentModel.ISupportInitialize)numLightEffectStrength).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
-
-        #endregion
-
-        private DarkUI.Controls.DarkCheckBox cbNoPathfinding;
-        private DarkUI.Controls.DarkCheckBox cbHorizon;
-        private DarkUI.Controls.DarkComboBox comboFlipMap;
-        private DarkUI.Controls.DarkLabel darkLabel19;
-        private DarkUI.Controls.DarkButton butRoomUp;
-        private DarkUI.Controls.DarkComboBox comboReverberation;
-        private DarkUI.Controls.DarkLabel darkLabel18;
-        private DarkUI.Controls.DarkComboBox comboLightEffect;
-        private DarkUI.Controls.DarkLabel darkLabel16;
-        private DarkUI.Controls.DarkCheckBox cbFlagOutside;
-        private DarkUI.Controls.DarkCheckBox cbFlagCold;
-        private DarkUI.Controls.DarkCheckBox cbFlagDamage;
-        private DarkUI.Controls.DarkComboBox comboRoomType;
-        private DarkUI.Controls.DarkLabel darkLabel15;
-        private TombLib.Controls.DarkSearchableComboBox comboRoom;
-        private DarkUI.Controls.DarkPanel panelRoomAmbientLight;
-        private DarkUI.Controls.DarkLabel darkLabel3;
-        private DarkUI.Controls.DarkButton butRoomDown;
-        private DarkUI.Controls.DarkButton butEditRoomName;
-        private DarkUI.Controls.DarkButton butCropRoom;
-        private DarkUI.Controls.DarkButton butSplitRoom;
-        private DarkUI.Controls.DarkCheckBox cbNoLensflare;
-        private System.Windows.Forms.ToolTip toolTip;
-        private DarkUI.Controls.DarkButton butLocked;
-        private DarkUI.Controls.DarkButton butDublicateRoom;
-        private DarkUI.Controls.DarkButton butDeleteRoom;
-        private DarkUI.Controls.DarkNumericUpDown numLightEffectStrength;
-        private TombLib.Controls.DarkAutocompleteTextBox tbRoomTags;
-        private DarkUI.Controls.DarkLabel darkLabel2;
-        private DarkUI.Controls.DarkButton butNewRoom;
-        private DarkUI.Controls.DarkLabel darkLabel1;
-        private DarkUI.Controls.DarkComboBox comboPortalShade;
-        private DarkUI.Controls.DarkButton butSelectPreviousRoom;
-        private DarkUI.Controls.DarkButton butHidden;
-        private DarkUI.Controls.DarkCheckBox cbFlagNoCaustics;
-    }
-}
diff --git a/TombEditor/ToolWindows/RoomOptions.cs b/TombEditor/ToolWindows/RoomOptions.cs
deleted file mode 100644
index 546b840888..0000000000
--- a/TombEditor/ToolWindows/RoomOptions.cs
+++ /dev/null
@@ -1,413 +0,0 @@
-using DarkUI.Docking;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using TombLib.Forms;
-using TombLib.LevelData;
-using TombLib.Utils;
-
-namespace TombEditor.ToolWindows
-{
-    public partial class RoomOptions : DarkToolWindow
-    {
-        private readonly Editor _editor;
-
-        public RoomOptions()
-        {
-            InitializeComponent();
-            CommandHandler.AssignCommandsToControls(Editor.Instance, this, toolTip);
-
-            _editor = Editor.Instance;
-            _editor.EditorEventRaised += EditorEventRaised;
-
-            // A hack to edit textbox size
-            tbRoomTags.AutoSize = false;
-            tbRoomTags.Height = 23;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-                _editor.EditorEventRaised -= EditorEventRaised;
-            if (disposing && components != null)
-                components.Dispose();
-            base.Dispose(disposing);
-        }
-
-        private int GetFlipMapSelectedIndex(Room room)
-        {
-            return room.Alternated ? ((comboFlipMap.Items.Count - 1 <= room.AlternateGroup) ? -1 : room.AlternateGroup + 1) : 0;
-        }
-
-        private void EditorEventRaised(IEditorEvent obj)
-        {
-            // Disable version-specific controls
-            if (obj is Editor.InitEvent ||
-                obj is Editor.GameVersionChangedEvent ||
-                obj is Editor.LevelChangedEvent)
-            {
-                bool isTR4orNG = _editor.Level.Settings.GameVersion.Native() == TRVersion.Game.TR4;
-                bool isNGorTEN = _editor.Level.Settings.GameVersion is TRVersion.Game.TRNG or TRVersion.Game.TombEngine;
-                bool supportsLensflare = _editor.Level.Settings.GameVersion.SupportsLensflare();
-                bool supportsReverb = _editor.Level.Settings.GameVersion.SupportsReverberation();
-                bool isTR1 = _editor.Level.Settings.GameVersion.Native() == TRVersion.Game.TR1;
-                bool isTEN = _editor.Level.Settings.GameVersion is TRVersion.Game.TombEngine;
-
-                cbHorizon.Enabled = !isTR1 || _editor.Level.IsTRX;
-                cbFlagOutside.Enabled = !isTR1 || _editor.Level.IsTRX;
-                cbFlagCold.Enabled = isNGorTEN;
-                cbFlagDamage.Enabled = isNGorTEN;
-                cbFlagNoCaustics.Enabled = isTEN;
-                cbNoLensflare.Enabled = supportsLensflare;
-                comboReverberation.Enabled = supportsReverb;
-                comboReverberation.SelectedIndexChanged -= comboReverberation_SelectedIndexChanged; // Prevent SelectedIndexChanged event from DataSource assignment in next line
-                comboReverberation.DataSource = isTR4orNG && _editor.Level.Settings.GameEnableExtraReverbPresets ? StringEnums.ExtraReverberationTypes : StringEnums.ReverberationTypes;
-                comboReverberation.SelectedIndexChanged += comboReverberation_SelectedIndexChanged;
-                comboReverberation.SelectedIndex = _editor.SelectedRoom.Properties.Reverberation < comboReverberation.Items.Count ? _editor.SelectedRoom.Properties.Reverberation : -1;
-                comboReverberation.DropDownWidth = isTR4orNG && _editor.Level.Settings.GameEnableExtraReverbPresets ? 121 : 71;
-                comboLightEffect.Enabled = !isTR1;
-                numLightEffectStrength.Enabled = !isTR1;
-
-                RepopulateRoomTypes();
-                RepopulateFlipmapList();
-
-                comboFlipMap.SelectedIndex = GetFlipMapSelectedIndex(_editor.SelectedRoom);
-            }
-
-            // Update the room list
-            if (obj is Editor.InitEvent || obj is Editor.RoomListChangedEvent)
-            {
-                // Adjust the amount of entries in the combo list
-                while (comboRoom.Items.Count > _editor.Level.Rooms.GetLength(0))
-                    comboRoom.Items.RemoveAt(comboRoom.Items.Count - 1);
-                while (comboRoom.Items.Count < _editor.Level.Rooms.GetLength(0))
-                    comboRoom.Items.Add("");
-
-                // Update the room list
-                for (int i = 0; i < _editor.Level.Rooms.GetLength(0); i++)
-                    if (_editor.Level.Rooms[i] != null)
-                        comboRoom.Items[i] = i + ": " + _editor.Level.Rooms[i].Name;
-                    else
-                        comboRoom.Items[i] = i + ": --- Empty room ---";
-            }
-
-            // Update taglist
-            if (obj is Editor.LevelChangedEvent || obj is Editor.SelectedRoomChangedEvent)
-            {
-                tbRoomTags.AutocompleteWords.Clear();
-                foreach (var room in (_editor.Level.Rooms))
-                    if (room != null && room.ExistsInLevel)
-                        tbRoomTags.AutocompleteWords.AddRange(room.Properties.Tags.Except(tbRoomTags.AutocompleteWords));
-            }
-
-            // Update the room property controls
-            if (obj is Editor.InitEvent || obj is Editor.SelectedRoomChangedEvent || obj is Editor.LevelChangedEvent ||
-                _editor.IsSelectedRoomEvent(obj as Editor.RoomPropertiesChangedEvent))
-            {
-                Room room = _editor.SelectedRoom;
-                if (obj is Editor.InitEvent || obj is Editor.SelectedRoomChangedEvent)
-                    comboRoom.SelectedIndex = _editor.Level.Rooms.ReferenceIndexOf(room);
-
-                // Update the state of other controls
-                ReadRoomType();
-                panelRoomAmbientLight.BackColor = (room.Properties.AmbientLight * new Vector3(0.5f, 0.5f, 0.5f)).ToWinFormsColor();
-                comboReverberation.SelectedIndex = room.Properties.Reverberation < comboReverberation.Items.Count ? room.Properties.Reverberation : -1;
-                comboPortalShade.SelectedIndex = (int)room.Properties.LightInterpolationMode;
-                comboLightEffect.SelectedIndex = (int)room.Properties.LightEffect;
-                numLightEffectStrength.Value = room.Properties.LightEffectStrength;
-                cbFlagCold.Checked = room.Properties.FlagCold;
-                cbFlagDamage.Checked = room.Properties.FlagDamage;
-                cbFlagOutside.Checked = room.Properties.FlagOutside;
-                cbFlagNoCaustics.Checked = room.Properties.FlagNoCaustics;
-                cbHorizon.Checked = room.Properties.FlagHorizon;
-                cbNoLensflare.Checked = room.Properties.FlagNoLensflare;
-                cbNoPathfinding.Checked = room.Properties.FlagExcludeFromPathFinding;
-                butHidden.Checked = room.Properties.Hidden;
-
-                if (!tbRoomTags.ReadOnly) // Only update tags field if we're not in the process of editing
-                {
-                    if (room.Properties.Tags.Count > 0)
-                        tbRoomTags.Text = string.Join(" ", room.Properties.Tags);
-                    else
-                        tbRoomTags.Text = "";
-                }
-
-                if (room.AlternateBaseRoom != null)
-                {
-                    butLocked.Enabled = false;
-                    butLocked.Checked = room.AlternateBaseRoom.Properties.Locked;
-                }
-                else
-                {
-                    butLocked.Enabled = true;
-                    butLocked.Checked = room.Properties.Locked;
-                }
-
-                comboFlipMap.SelectedIndex = GetFlipMapSelectedIndex(room);
-            }
-
-            // Activate default control
-            if (obj is Editor.DefaultControlActivationEvent)
-            {
-                if (DockPanel != null && ((Editor.DefaultControlActivationEvent)obj).ContainerName == GetType().Name)
-                {
-                    MakeActive();
-                    comboRoom.Search();
-                }
-            }
-
-            // Update tooltip texts
-            if (obj is Editor.ConfigurationChangedEvent)
-            {
-                if (((Editor.ConfigurationChangedEvent)obj).UpdateKeyboardShortcuts)
-                    CommandHandler.AssignCommandsToControls(_editor, this, toolTip, true);
-            }
-        }
-
-        private void RepopulateFlipmapList()
-        {
-            var index = comboFlipMap.SelectedIndex;
-
-            comboFlipMap.Items.Clear();
-            comboFlipMap.Items.Add("None");
-
-            int flipmapCount = (_editor.Level.Settings.GameVersion == TRVersion.Game.TombEngine) ? byte.MaxValue : 15;
-
-            for (int i = 0; i < flipmapCount; i++)
-                comboFlipMap.Items.Add(i.ToString());
-
-            comboFlipMap.SelectedIndex = (comboFlipMap.Items.Count - 1 <= index) ? -1 : index;
-        }
-
-        private void RepopulateRoomTypes()
-        {
-            // Repopulate room type
-            comboRoomType.Items.Clear();
-            comboRoomType.Items.Add("Normal");
-            comboRoomType.Items.Add("Water");
-
-            if (_editor.Level.Settings.GameVersion == TRVersion.Game.TR3 ||
-                _editor.Level.IsTRX ||
-                _editor.Level.IsNG ||
-                _editor.Level.IsTombEngine)
-                comboRoomType.Items.Add("Quicksand");
-
-            if (_editor.Level.IsNG)
-                StringEnums.NGRoomTypes.ForEach(i => comboRoomType.Items.Add(i));
-
-            ReadRoomType();
-
-            // Repopulate room effect type
-            bool isTR2 = _editor.Level.Settings.GameVersion.Native() == TRVersion.Game.TR2;
-            var list = new List<string>()
-            {
-                "None",
-                "Default",
-                "Reflection",
-                "Glow",
-                isTR2 ? "Flicker" : "Move",       // Show as flicker for TR2
-                isTR2 ? "Sunset" : "Glow & Move", // Show as sunset for TR2
-                "Mist"
-            };
-
-            var backupIndex = comboLightEffect.SelectedIndex;
-            comboLightEffect.Items.Clear();
-            list.ForEach(i => comboLightEffect.Items.Add(i));
-            comboLightEffect.SelectedIndex = backupIndex;
-        }
-
-        private void WriteRoomType()
-        {
-            RoomType newType;
-            byte newStrength = 0;
-
-            switch (comboRoomType.SelectedIndex)
-            {
-                case -1:
-                    // Wrong type, do nothing
-                    return;
-                case 0:
-                    newType = RoomType.Normal;
-                    break;
-                case 1:
-                    newType = RoomType.Water;
-                    break;
-                case 2:
-                    newType = RoomType.Quicksand;
-                    break;
-                default:
-                    if (comboRoomType.SelectedIndex <= 6)
-                    {
-                        newType = RoomType.Rain;
-                        newStrength = (byte)(comboRoomType.SelectedIndex - 3);
-                    }
-                    else
-                    {
-                        newType = RoomType.Snow;
-                        newStrength = (byte)(comboRoomType.SelectedIndex - 7);
-                    }
-                    break;
-            }
-
-            if (_editor.SelectedRoom.Properties.Type != newType || _editor.SelectedRoom.Properties.TypeStrength != newStrength)
-            {
-                _editor.SelectedRoom.Properties.Type = newType;
-                _editor.SelectedRoom.Properties.TypeStrength = newStrength;
-                _editor.RoomPropertiesChange(_editor.SelectedRoom);
-            }
-        }
-
-        private void ReadRoomType()
-        {
-            var room = _editor.SelectedRoom;
-
-            // Cleverly switch room types dependent on game version.
-            // We disable rain/snow types for TombEngine because it is expected to set these options with triggers and/or script.
-
-            int roomType = -1;
-            if (room.Properties.Type == RoomType.Quicksand &&
-                (_editor.Level.Settings.GameVersion != TRVersion.Game.TR3 &&
-                 _editor.Level.Settings.GameVersion != TRVersion.Game.TRNG &&
-                 _editor.Level.Settings.GameVersion != TRVersion.Game.TombEngine &&
-                 !_editor.Level.IsTRX))
-                roomType = -1;
-            else if ((room.Properties.Type == RoomType.Rain || room.Properties.Type == RoomType.Snow) &&
-                     _editor.Level.Settings.GameVersion != TRVersion.Game.TRNG)
-                roomType = -1;
-            else
-            {
-                switch (room.Properties.Type)
-                {
-                    case RoomType.Normal:
-                        roomType = 0;
-                        break;
-                    case RoomType.Water:
-                        roomType = 1;
-                        break;
-                    case RoomType.Quicksand:
-                        roomType = 2;
-                        break;
-                    case RoomType.Rain:
-                        roomType = 3 + room.Properties.TypeStrength;
-                        break;
-                    case RoomType.Snow:
-                        roomType = 7 + room.Properties.TypeStrength;
-                        break;
-                }
-            }
-
-            comboRoomType.SelectedIndex = roomType;
-
-            // If selected type is -1 it means this room type is unsupported in current version. Throw a message about it.
-            if (roomType == -1)
-                _editor.SendMessage("Current room type is not supported in this engine version.\nChange it manually or switch engine version.", PopupType.Warning);
-
-        }
-
-        private void comboRoom_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            Room selectedRoom = _editor.Level.Rooms[comboRoom.SelectedIndex];
-            if (selectedRoom == null)
-                EditorActions.MakeNewRoom(comboRoom.SelectedIndex);
-            else
-                _editor.SelectRoom(selectedRoom);
-        }
-
-        private void comboFlipMap_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (_editor.SelectedRoom == null || comboFlipMap.SelectedIndex == -1)
-                return;
-
-            var room = _editor.SelectedRoom;
-            short alternateGroupIndex = (short)(comboFlipMap.SelectedIndex - 1);
-
-            if (room.Alternated)
-            {
-                if (alternateGroupIndex == -1)
-                { // Delete flipped room
-                    EditorActions.AlternateRoomDisableWithWarning(room, this);
-                }
-                else
-                { // Change flipped map number, not much to do here
-                    if (room.AlternateGroup != alternateGroupIndex &&
-                        room.AlternateOpposite.AlternateGroup != alternateGroupIndex)
-                    {
-
-                        room.AlternateGroup = alternateGroupIndex;
-                        room.AlternateOpposite.AlternateGroup = alternateGroupIndex;
-                        _editor.RoomPropertiesChange(room);
-                        _editor.RoomPropertiesChange(room.AlternateOpposite);
-                    }
-                }
-            }
-            else
-            {
-                if (alternateGroupIndex != -1)
-                {// Create a new flipped room
-                    EditorActions.AlternateRoomEnable(room, alternateGroupIndex);
-                }
-            }
-
-            // Update combo box even if nothing changed internally
-            // to correct invalid user input
-            EditorEventRaised(new Editor.RoomPropertiesChangedEvent { Room = room });
-        }
-
-        private void comboReverberation_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (_editor.SelectedRoom.Properties.Reverberation == comboReverberation.SelectedIndex)
-                return;
-
-            // Show extra tooltips in case reverb modes are extended
-            if (_editor.Level.Settings.GameEnableExtraReverbPresets && comboReverberation.SelectedIndex > 0)
-                toolTip.SetToolTip(comboReverberation, comboReverberation.Text);
-            else
-                toolTip.SetToolTip(comboReverberation, string.Empty);
-
-            _editor.SelectedRoom.Properties.Reverberation = (byte)comboReverberation.SelectedIndex;
-            _editor.RoomPropertiesChange(_editor.SelectedRoom);
-        }
-
-        private void numLightEffectStrength_ValueChanged(object sender, EventArgs e)
-        {
-            _editor.SelectedRoom.Properties.LightEffectStrength = (byte)numLightEffectStrength.Value;
-            _editor.RoomPropertiesChange(_editor.SelectedRoom);
-        }
-
-        private void comboRoomType_SelectedIndexChanged(object sender, EventArgs e) => WriteRoomType();
-
-        private void comboLightEffect_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            if (_editor.SelectedRoom.Properties.LightEffect == (RoomLightEffect)comboLightEffect.SelectedIndex)
-                return;
-
-            _editor.SelectedRoom.Properties.LightEffect = (RoomLightEffect)comboLightEffect.SelectedIndex;
-            _editor.RoomPropertiesChange(_editor.SelectedRoom);
-        }
-
-        private void comboPortalShade_SelectedIndexChanged(object sender, EventArgs e)
-        {
-
-            if (_editor.SelectedRoom.Properties.LightInterpolationMode == (RoomLightInterpolationMode)comboPortalShade.SelectedIndex)
-                return;
-
-            _editor.SelectedRoom.Properties.LightInterpolationMode = (RoomLightInterpolationMode)comboPortalShade.SelectedIndex;
-            _editor.RoomPropertiesChange(_editor.SelectedRoom);
-        }
-
-        private void TbTags_TextChanged(object sender, EventArgs e)
-        {
-            if (_editor.SelectedRoom == null)
-                return;
-
-            tbRoomTags.ReadOnly = true; // Prevent textbox from internally recalling this event
-
-            _editor.SelectedRoom.Properties.Tags = tbRoomTags.Text.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries).ToList();
-            _editor.RoomPropertiesChange(_editor.SelectedRoom);
-
-            tbRoomTags.ReadOnly = false; // Re-enable editing
-        }
-
-    }
-}
diff --git a/TombEditor/ToolWindows/SectorOptions.Designer.cs b/TombEditor/ToolWindows/SectorOptions.Designer.cs
deleted file mode 100644
index de328e59c1..0000000000
--- a/TombEditor/ToolWindows/SectorOptions.Designer.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-namespace TombEditor.ToolWindows
-{
-    partial class SectorOptions
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        #region Component Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            this.panel2DGrid = new TombEditor.Controls.Panel2DGrid();
-            this.panelRight = new System.Windows.Forms.Panel();
-            this.butAddGhostBlock = new DarkUI.Controls.DarkButton();
-            this.butCeiling = new DarkUI.Controls.DarkButton();
-            this.butClimbPositiveZ = new DarkUI.Controls.DarkButton();
-            this.butClimbPositiveX = new DarkUI.Controls.DarkButton();
-            this.butClimbNegativeZ = new DarkUI.Controls.DarkButton();
-            this.butClimbNegativeX = new DarkUI.Controls.DarkButton();
-            this.butNotWalkableBox = new DarkUI.Controls.DarkButton();
-            this.butPortal = new DarkUI.Controls.DarkButton();
-            this.butFlagTriggerTriggerer = new DarkUI.Controls.DarkButton();
-            this.butDeath = new DarkUI.Controls.DarkButton();
-            this.butForceSolidFloor = new DarkUI.Controls.DarkButton();
-            this.butMonkey = new DarkUI.Controls.DarkButton();
-            this.butFlagBeetle = new DarkUI.Controls.DarkButton();
-            this.butBox = new DarkUI.Controls.DarkButton();
-            this.butFloor = new DarkUI.Controls.DarkButton();
-            this.butWall = new DarkUI.Controls.DarkButton();
-            this.panel2DGrid_sub = new System.Windows.Forms.Panel();
-            this.panelBottom = new System.Windows.Forms.Panel();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.butDiagonalWall = new DarkUI.Controls.DarkButton();
-            this.butDiagonalFloor = new DarkUI.Controls.DarkButton();
-            this.butDiagonalCeiling = new DarkUI.Controls.DarkButton();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.panelRight.SuspendLayout();
-            this.panel2DGrid_sub.SuspendLayout();
-            this.panelBottom.SuspendLayout();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel2DGrid
-            // 
-            this.panel2DGrid.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2DGrid.Location = new System.Drawing.Point(2, 0);
-            this.panel2DGrid.Name = "panel2DGrid";
-            this.panel2DGrid.Padding = new System.Windows.Forms.Padding(2);
-            this.panel2DGrid.Room = null;
-            this.panel2DGrid.Size = new System.Drawing.Size(224, 223);
-            this.panel2DGrid.TabIndex = 103;
-            // 
-            // panelRight
-            // 
-            this.panelRight.Controls.Add(this.butAddGhostBlock);
-            this.panelRight.Controls.Add(this.butCeiling);
-            this.panelRight.Controls.Add(this.butClimbPositiveZ);
-            this.panelRight.Controls.Add(this.butClimbPositiveX);
-            this.panelRight.Controls.Add(this.butClimbNegativeZ);
-            this.panelRight.Controls.Add(this.butClimbNegativeX);
-            this.panelRight.Controls.Add(this.butNotWalkableBox);
-            this.panelRight.Controls.Add(this.butPortal);
-            this.panelRight.Controls.Add(this.butFlagTriggerTriggerer);
-            this.panelRight.Controls.Add(this.butDeath);
-            this.panelRight.Controls.Add(this.butForceSolidFloor);
-            this.panelRight.Controls.Add(this.butMonkey);
-            this.panelRight.Controls.Add(this.butFlagBeetle);
-            this.panelRight.Controls.Add(this.butBox);
-            this.panelRight.Controls.Add(this.butFloor);
-            this.panelRight.Controls.Add(this.butWall);
-            this.panelRight.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panelRight.Location = new System.Drawing.Point(226, 0);
-            this.panelRight.Name = "panelRight";
-            this.panelRight.Padding = new System.Windows.Forms.Padding(2);
-            this.panelRight.Size = new System.Drawing.Size(58, 223);
-            this.panelRight.TabIndex = 109;
-            // 
-            // butAddGhostBlock
-            // 
-            this.butAddGhostBlock.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butAddGhostBlock.Checked = false;
-            this.butAddGhostBlock.Image = global::TombEditor.Properties.Resources.objects_geometry_override_16;
-            this.butAddGhostBlock.Location = new System.Drawing.Point(3, 197);
-            this.butAddGhostBlock.Name = "butAddGhostBlock";
-            this.butAddGhostBlock.Size = new System.Drawing.Size(24, 24);
-            this.butAddGhostBlock.TabIndex = 14;
-            this.butAddGhostBlock.Tag = "AddGhostBlocksToSelection";
-            // 
-            // butCeiling
-            // 
-            this.butCeiling.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butCeiling.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(170)))), ((int)(((byte)(170)))));
-            this.butCeiling.BackColorUseGeneric = false;
-            this.butCeiling.Checked = false;
-            this.butCeiling.ForeColor = System.Drawing.Color.White;
-            this.butCeiling.Image = global::TombEditor.Properties.Resources.sectortype_Roof_16;
-            this.butCeiling.Location = new System.Drawing.Point(32, 1);
-            this.butCeiling.Name = "butCeiling";
-            this.butCeiling.Size = new System.Drawing.Size(24, 24);
-            this.butCeiling.TabIndex = 1;
-            this.butCeiling.Tag = "SetCeiling";
-            this.butCeiling.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butClimbPositiveZ
-            // 
-            this.butClimbPositiveZ.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butClimbPositiveZ.Checked = false;
-            this.butClimbPositiveZ.Image = global::TombEditor.Properties.Resources.sectortype_ClimbNorth_16;
-            this.butClimbPositiveZ.Location = new System.Drawing.Point(3, 141);
-            this.butClimbPositiveZ.Name = "butClimbPositiveZ";
-            this.butClimbPositiveZ.Size = new System.Drawing.Size(24, 24);
-            this.butClimbPositiveZ.TabIndex = 10;
-            this.butClimbPositiveZ.Tag = "SetClimbPositiveZ";
-            this.butClimbPositiveZ.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butClimbPositiveX
-            // 
-            this.butClimbPositiveX.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butClimbPositiveX.Checked = false;
-            this.butClimbPositiveX.Image = global::TombEditor.Properties.Resources.sectortype_ClimbEast_16;
-            this.butClimbPositiveX.Location = new System.Drawing.Point(32, 169);
-            this.butClimbPositiveX.Name = "butClimbPositiveX";
-            this.butClimbPositiveX.Size = new System.Drawing.Size(24, 24);
-            this.butClimbPositiveX.TabIndex = 13;
-            this.butClimbPositiveX.Tag = "SetClimbPositiveX";
-            this.butClimbPositiveX.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butClimbNegativeZ
-            // 
-            this.butClimbNegativeZ.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butClimbNegativeZ.Checked = false;
-            this.butClimbNegativeZ.Image = global::TombEditor.Properties.Resources.sectortype_ClimbSouth_1_16;
-            this.butClimbNegativeZ.Location = new System.Drawing.Point(32, 141);
-            this.butClimbNegativeZ.Name = "butClimbNegativeZ";
-            this.butClimbNegativeZ.Size = new System.Drawing.Size(24, 24);
-            this.butClimbNegativeZ.TabIndex = 11;
-            this.butClimbNegativeZ.Tag = "SetClimbNegativeZ";
-            this.butClimbNegativeZ.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butClimbNegativeX
-            // 
-            this.butClimbNegativeX.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butClimbNegativeX.Checked = false;
-            this.butClimbNegativeX.Image = global::TombEditor.Properties.Resources.sectortype_ClimbWest_16;
-            this.butClimbNegativeX.Location = new System.Drawing.Point(3, 169);
-            this.butClimbNegativeX.Name = "butClimbNegativeX";
-            this.butClimbNegativeX.Size = new System.Drawing.Size(24, 24);
-            this.butClimbNegativeX.TabIndex = 12;
-            this.butClimbNegativeX.Tag = "SetClimbNegativeX";
-            this.butClimbNegativeX.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butNotWalkableBox
-            // 
-            this.butNotWalkableBox.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butNotWalkableBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(150)))));
-            this.butNotWalkableBox.BackColorUseGeneric = false;
-            this.butNotWalkableBox.Checked = false;
-            this.butNotWalkableBox.ForeColor = System.Drawing.Color.White;
-            this.butNotWalkableBox.Image = global::TombEditor.Properties.Resources.sectortype_NotWalkable_16;
-            this.butNotWalkableBox.Location = new System.Drawing.Point(32, 29);
-            this.butNotWalkableBox.Name = "butNotWalkableBox";
-            this.butNotWalkableBox.Size = new System.Drawing.Size(24, 24);
-            this.butNotWalkableBox.TabIndex = 3;
-            this.butNotWalkableBox.Tag = "SetNotWalkable";
-            this.butNotWalkableBox.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butPortal
-            // 
-            this.butPortal.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butPortal.BackColor = System.Drawing.Color.Black;
-            this.butPortal.BackColorUseGeneric = false;
-            this.butPortal.Checked = false;
-            this.butPortal.ForeColor = System.Drawing.Color.White;
-            this.butPortal.Image = global::TombEditor.Properties.Resources.sectortype_Portal__16;
-            this.butPortal.Location = new System.Drawing.Point(3, 85);
-            this.butPortal.Name = "butPortal";
-            this.butPortal.Size = new System.Drawing.Size(24, 24);
-            this.butPortal.TabIndex = 6;
-            this.butPortal.Tag = "AddPortal";
-            this.butPortal.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butFlagTriggerTriggerer
-            // 
-            this.butFlagTriggerTriggerer.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butFlagTriggerTriggerer.Checked = false;
-            this.butFlagTriggerTriggerer.Image = global::TombEditor.Properties.Resources.sectortype_TriggerTriggerer_16;
-            this.butFlagTriggerTriggerer.Location = new System.Drawing.Point(3, 113);
-            this.butFlagTriggerTriggerer.Name = "butFlagTriggerTriggerer";
-            this.butFlagTriggerTriggerer.Size = new System.Drawing.Size(24, 24);
-            this.butFlagTriggerTriggerer.TabIndex = 9;
-            this.butFlagTriggerTriggerer.Tag = "SetTriggerTriggerer";
-            this.butFlagTriggerTriggerer.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butDeath
-            // 
-            this.butDeath.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butDeath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(200)))), ((int)(((byte)(0)))));
-            this.butDeath.BackColorUseGeneric = false;
-            this.butDeath.Checked = false;
-            this.butDeath.ForeColor = System.Drawing.Color.White;
-            this.butDeath.Image = global::TombEditor.Properties.Resources.sectortype_Death_16;
-            this.butDeath.Location = new System.Drawing.Point(32, 57);
-            this.butDeath.Name = "butDeath";
-            this.butDeath.Size = new System.Drawing.Size(24, 24);
-            this.butDeath.TabIndex = 5;
-            this.butDeath.Tag = "SetDeath";
-            this.butDeath.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butForceSolidFloor
-            // 
-            this.butForceSolidFloor.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butForceSolidFloor.Checked = false;
-            this.butForceSolidFloor.Image = global::TombEditor.Properties.Resources.sectortype_ForceSolidFloor_16_copy;
-            this.butForceSolidFloor.Location = new System.Drawing.Point(32, 197);
-            this.butForceSolidFloor.Name = "butForceSolidFloor";
-            this.butForceSolidFloor.Size = new System.Drawing.Size(24, 24);
-            this.butForceSolidFloor.TabIndex = 15;
-            this.butForceSolidFloor.Tag = "ToggleForceFloorSolid";
-            this.butForceSolidFloor.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butMonkey
-            // 
-            this.butMonkey.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butMonkey.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
-            this.butMonkey.BackColorUseGeneric = false;
-            this.butMonkey.Checked = false;
-            this.butMonkey.ForeColor = System.Drawing.Color.White;
-            this.butMonkey.Image = global::TombEditor.Properties.Resources.sectortype_Monkey_16;
-            this.butMonkey.Location = new System.Drawing.Point(3, 57);
-            this.butMonkey.Name = "butMonkey";
-            this.butMonkey.Size = new System.Drawing.Size(24, 24);
-            this.butMonkey.TabIndex = 4;
-            this.butMonkey.Tag = "SetMonkeyswing";
-            this.butMonkey.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butFlagBeetle
-            // 
-            this.butFlagBeetle.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butFlagBeetle.Checked = false;
-            this.butFlagBeetle.Image = global::TombEditor.Properties.Resources.sectortype_Beetle_16;
-            this.butFlagBeetle.Location = new System.Drawing.Point(32, 113);
-            this.butFlagBeetle.Name = "butFlagBeetle";
-            this.butFlagBeetle.Size = new System.Drawing.Size(24, 24);
-            this.butFlagBeetle.TabIndex = 8;
-            this.butFlagBeetle.Tag = "SetBeetleCheckpoint";
-            this.butFlagBeetle.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butBox
-            // 
-            this.butBox.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(100)))), ((int)(((byte)(100)))));
-            this.butBox.BackColorUseGeneric = false;
-            this.butBox.Checked = false;
-            this.butBox.ForeColor = System.Drawing.Color.White;
-            this.butBox.Image = global::TombEditor.Properties.Resources.sectortype_Box_16;
-            this.butBox.Location = new System.Drawing.Point(3, 29);
-            this.butBox.Name = "butBox";
-            this.butBox.Size = new System.Drawing.Size(24, 24);
-            this.butBox.TabIndex = 2;
-            this.butBox.Tag = "SetBox";
-            this.butBox.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butFloor
-            // 
-            this.butFloor.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butFloor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(170)))), ((int)(((byte)(170)))));
-            this.butFloor.BackColorUseGeneric = false;
-            this.butFloor.Checked = false;
-            this.butFloor.ForeColor = System.Drawing.Color.White;
-            this.butFloor.Image = global::TombEditor.Properties.Resources.sectortype_Floor_1_16;
-            this.butFloor.Location = new System.Drawing.Point(3, 1);
-            this.butFloor.Name = "butFloor";
-            this.butFloor.Size = new System.Drawing.Size(24, 24);
-            this.butFloor.TabIndex = 0;
-            this.butFloor.Tag = "SetFloor";
-            this.butFloor.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // butWall
-            // 
-            this.butWall.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.butWall.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(120)))), ((int)(((byte)(0)))));
-            this.butWall.BackColorUseGeneric = false;
-            this.butWall.Checked = false;
-            this.butWall.ForeColor = System.Drawing.Color.White;
-            this.butWall.Image = global::TombEditor.Properties.Resources.sectortype_Wall_1_16;
-            this.butWall.Location = new System.Drawing.Point(32, 85);
-            this.butWall.Name = "butWall";
-            this.butWall.Size = new System.Drawing.Size(24, 24);
-            this.butWall.TabIndex = 7;
-            this.butWall.Tag = "SetWall";
-            this.butWall.MouseEnter += new System.EventHandler(this.but_MouseEnter);
-            // 
-            // panel2DGrid_sub
-            // 
-            this.panel2DGrid_sub.Controls.Add(this.panel2DGrid);
-            this.panel2DGrid_sub.Controls.Add(this.panelRight);
-            this.panel2DGrid_sub.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel2DGrid_sub.Location = new System.Drawing.Point(0, 25);
-            this.panel2DGrid_sub.Name = "panel2DGrid_sub";
-            this.panel2DGrid_sub.Padding = new System.Windows.Forms.Padding(2, 0, 0, 4);
-            this.panel2DGrid_sub.Size = new System.Drawing.Size(284, 227);
-            this.panel2DGrid_sub.TabIndex = 111;
-            // 
-            // panelBottom
-            // 
-            this.panelBottom.Controls.Add(this.tableLayoutPanel1);
-            this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelBottom.Location = new System.Drawing.Point(0, 252);
-            this.panelBottom.Margin = new System.Windows.Forms.Padding(0);
-            this.panelBottom.Name = "panelBottom";
-            this.panelBottom.Size = new System.Drawing.Size(284, 26);
-            this.panelBottom.TabIndex = 110;
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 3;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel1.Controls.Add(this.butDiagonalWall, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.butDiagonalFloor, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.butDiagonalCeiling, 1, 0);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 1;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(284, 26);
-            this.tableLayoutPanel1.TabIndex = 0;
-            // 
-            // butDiagonalWall
-            // 
-            this.butDiagonalWall.Checked = false;
-            this.butDiagonalWall.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.butDiagonalWall.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.butDiagonalWall.Image = global::TombEditor.Properties.Resources.sectortype_DiagonalWall2_16;
-            this.butDiagonalWall.Location = new System.Drawing.Point(190, 0);
-            this.butDiagonalWall.Margin = new System.Windows.Forms.Padding(2, 0, 2, 2);
-            this.butDiagonalWall.Name = "butDiagonalWall";
-            this.butDiagonalWall.Size = new System.Drawing.Size(92, 24);
-            this.butDiagonalWall.TabIndex = 18;
-            this.butDiagonalWall.Tag = "SetDiagonalWall";
-            this.butDiagonalWall.Text = "Diag wall";
-            this.butDiagonalWall.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-            // 
-            // butDiagonalFloor
-            // 
-            this.butDiagonalFloor.Checked = false;
-            this.butDiagonalFloor.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.butDiagonalFloor.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.butDiagonalFloor.Image = global::TombEditor.Properties.Resources.sectortype_StepFloor_1_16;
-            this.butDiagonalFloor.Location = new System.Drawing.Point(2, 0);
-            this.butDiagonalFloor.Margin = new System.Windows.Forms.Padding(2, 0, 2, 2);
-            this.butDiagonalFloor.Name = "butDiagonalFloor";
-            this.butDiagonalFloor.Size = new System.Drawing.Size(90, 24);
-            this.butDiagonalFloor.TabIndex = 16;
-            this.butDiagonalFloor.Tag = "SetDiagonalFloorStep";
-            this.butDiagonalFloor.Text = "Floor step";
-            this.butDiagonalFloor.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-            // 
-            // butDiagonalCeiling
-            // 
-            this.butDiagonalCeiling.Checked = false;
-            this.butDiagonalCeiling.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.butDiagonalCeiling.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.butDiagonalCeiling.Image = global::TombEditor.Properties.Resources.sectortype_StepCeiling_16;
-            this.butDiagonalCeiling.Location = new System.Drawing.Point(96, 0);
-            this.butDiagonalCeiling.Margin = new System.Windows.Forms.Padding(2, 0, 2, 2);
-            this.butDiagonalCeiling.Name = "butDiagonalCeiling";
-            this.butDiagonalCeiling.Size = new System.Drawing.Size(90, 24);
-            this.butDiagonalCeiling.TabIndex = 17;
-            this.butDiagonalCeiling.Tag = "SetDiagonalCeilingStep";
-            this.butDiagonalCeiling.Text = "Ceiling step";
-            this.butDiagonalCeiling.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
-            // 
-            // toolTip
-            // 
-            this.toolTip.AutoPopDelay = 5000;
-            this.toolTip.InitialDelay = 500;
-            this.toolTip.ReshowDelay = 100;
-            // 
-            // SectorOptions
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.Controls.Add(this.panel2DGrid_sub);
-            this.Controls.Add(this.panelBottom);
-            this.DockText = "Sector Options";
-            this.MinimumSize = new System.Drawing.Size(284, 278);
-            this.Name = "SectorOptions";
-            this.SerializationKey = "SectorOptions";
-            this.Size = new System.Drawing.Size(284, 278);
-            this.panelRight.ResumeLayout(false);
-            this.panel2DGrid_sub.ResumeLayout(false);
-            this.panelBottom.ResumeLayout(false);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private Controls.Panel2DGrid panel2DGrid;
-        private System.Windows.Forms.Panel panelRight;
-        private DarkUI.Controls.DarkButton butCeiling;
-        private DarkUI.Controls.DarkButton butClimbPositiveZ;
-        private DarkUI.Controls.DarkButton butClimbPositiveX;
-        private DarkUI.Controls.DarkButton butClimbNegativeZ;
-        private DarkUI.Controls.DarkButton butClimbNegativeX;
-        private DarkUI.Controls.DarkButton butNotWalkableBox;
-        private DarkUI.Controls.DarkButton butPortal;
-        private DarkUI.Controls.DarkButton butFlagTriggerTriggerer;
-        private DarkUI.Controls.DarkButton butDeath;
-        private DarkUI.Controls.DarkButton butForceSolidFloor;
-        private DarkUI.Controls.DarkButton butMonkey;
-        private DarkUI.Controls.DarkButton butFlagBeetle;
-        private DarkUI.Controls.DarkButton butBox;
-        private DarkUI.Controls.DarkButton butFloor;
-        private DarkUI.Controls.DarkButton butWall;
-        private System.Windows.Forms.Panel panel2DGrid_sub;
-        private DarkUI.Controls.DarkButton butDiagonalWall;
-        private DarkUI.Controls.DarkButton butDiagonalCeiling;
-        private DarkUI.Controls.DarkButton butDiagonalFloor;
-        private System.Windows.Forms.Panel panelBottom;
-        private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private DarkUI.Controls.DarkButton butAddGhostBlock;
-    }
-}
diff --git a/TombEditor/ToolWindows/SectorOptions.cs b/TombEditor/ToolWindows/SectorOptions.cs
deleted file mode 100644
index 0682cc1d7f..0000000000
--- a/TombEditor/ToolWindows/SectorOptions.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-using DarkUI.Docking;
-using NLog;
-using System;
-using System.Windows.Forms;
-using TombLib.LevelData;
-using TombLib.Rendering;
-using TombLib.Utils;
-
-namespace TombEditor.ToolWindows
-{
-    public partial class SectorOptions : DarkToolWindow
-    {
-        private readonly Editor _editor;
-        private static readonly Logger logger = LogManager.GetCurrentClassLogger();
-
-        private const float iconSwitchBrightnessThreshold = 0.8f;
-
-        public SectorOptions()
-        {
-            InitializeComponent();
-            CommandHandler.AssignCommandsToControls(Editor.Instance, this, toolTip);
-
-            _editor = Editor.Instance;
-            _editor.EditorEventRaised += EditorEventRaised;
-
-            panel2DGrid.Room = _editor.SelectedRoom;
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-                _editor.EditorEventRaised -= EditorEventRaised;
-            if (disposing && components != null)
-                components.Dispose();
-            base.Dispose(disposing);
-        }
-
-        private void EditorEventRaised(IEditorEvent obj)
-        {
-            if (obj is Editor.SelectedRoomChangedEvent)
-                panel2DGrid.Room = ((Editor.SelectedRoomChangedEvent)obj).Current;
-
-            // Update tooltip texts
-            if (obj is Editor.ConfigurationChangedEvent)
-            {
-                if (((Editor.ConfigurationChangedEvent)obj).UpdateKeyboardShortcuts)
-                    CommandHandler.AssignCommandsToControls(_editor, this, toolTip, true);
-            }
-
-            // Update color scheme on buttons
-            if (obj is Editor.ConfigurationChangedEvent || obj is Editor.InitEvent)
-            {
-                butFloor.BackColor = _editor.Configuration.UI_ColorScheme.ColorFloor.ToWinFormsColor();
-                butFloor.Image = (butFloor.BackColor.GetBrightness() > iconSwitchBrightnessThreshold) ? Properties.Resources.sectortype_Floor_neg_16 : Properties.Resources.sectortype_Floor_1_16;
-                butCeiling.BackColor = _editor.Configuration.UI_ColorScheme.ColorFloor.ToWinFormsColor();
-                butCeiling.Image = (butCeiling.BackColor.GetBrightness() > iconSwitchBrightnessThreshold) ? Properties.Resources.sectortype_Roof_neg_16 : Properties.Resources.sectortype_Roof_16;
-                butBox.BackColor = _editor.Configuration.UI_ColorScheme.ColorBox.ToWinFormsColor();
-                butBox.Image = (butBox.BackColor.GetBrightness() > iconSwitchBrightnessThreshold) ? Properties.Resources.sectortype_Box_neg_16 : Properties.Resources.sectortype_Box_16;
-                butNotWalkableBox.BackColor = _editor.Configuration.UI_ColorScheme.ColorNotWalkable.ToWinFormsColor();
-                butNotWalkableBox.Image = (butNotWalkableBox.BackColor.GetBrightness() > iconSwitchBrightnessThreshold) ? Properties.Resources.sectortype_NotWalkable_neg_16 : Properties.Resources.sectortype_NotWalkable_16;
-                butMonkey.BackColor = _editor.Configuration.UI_ColorScheme.ColorMonkey.ToWinFormsColor();
-                butMonkey.Image = (butMonkey.BackColor.GetBrightness() > iconSwitchBrightnessThreshold) ? Properties.Resources.sectortype_Monkey_neg_16 : Properties.Resources.sectortype_Monkey_16;
-                butDeath.BackColor = _editor.Configuration.UI_ColorScheme.ColorDeath.ToWinFormsColor();
-                butDeath.Image = (butDeath.BackColor.GetBrightness() > iconSwitchBrightnessThreshold) ? Properties.Resources.sectortype_Death_neg_16 : Properties.Resources.sectortype_Death_16;
-                butPortal.BackColor = _editor.Configuration.UI_ColorScheme.ColorPortal.ToWinFormsColor();
-                butPortal.Image = (butPortal.BackColor.GetBrightness() > iconSwitchBrightnessThreshold) ? Properties.Resources.sectortype_Portal_neg__16 : Properties.Resources.sectortype_Portal__16;
-                butWall.BackColor = _editor.Configuration.UI_ColorScheme.ColorWall.ToWinFormsColor();
-                butWall.Image = (butWall.BackColor.GetBrightness() > iconSwitchBrightnessThreshold) ? Properties.Resources.sectortype_Wall_neg_16 : Properties.Resources.sectortype_Wall_1_16;
-            }
-
-            // Disable version-specific controls
-            if (obj is Editor.InitEvent ||
-                obj is Editor.GameVersionChangedEvent ||
-                obj is Editor.LevelChangedEvent)
-            {
-                bool climbingSupported = _editor.Level.Settings.GameVersion.SupportsClimbing();
-                bool isTR345 = _editor.Level.Settings.GameVersion.Native() >= TRVersion.Game.TR3;
-
-                butClimbNegativeX.Enabled = climbingSupported;
-                butClimbNegativeZ.Enabled = climbingSupported;
-                butClimbPositiveX.Enabled = climbingSupported;
-                butClimbPositiveZ.Enabled = climbingSupported;
-                butMonkey.Enabled = _editor.Level.Settings.GameVersion.SupportsMonkeySwing();
-                butFlagBeetle.Enabled = isTR345;
-                butFlagTriggerTriggerer.Enabled = isTR345;
-
-                if (_editor.Level.Settings.GameVersion.Native() >= TRVersion.Game.TR4)
-                {
-                    butFlagTriggerTriggerer.Image = Properties.Resources.sectortype_TriggerTriggerer_16;
-                    butFlagBeetle.Image = Properties.Resources.sectortype_Beetle_16;
-                }
-                else
-                {
-
-                    butFlagTriggerTriggerer.Image = Properties.Resources.sectortype_MinecartLeft_16;
-                    butFlagBeetle.Image = Properties.Resources.sectortype_MinecartRight_16;
-                }
-            }
-        }
-
-        private void but_MouseEnter(object sender, EventArgs e)
-        {
-            SetSectorColoringInfoPriority(sender as Control);
-        }
-
-        private void SetSectorColoringInfoPriority(Control button)
-        {
-            if (!_editor.Configuration.UI_AutoSwitchSectorColoringInfo)
-                return;
-
-            if (button == butBox)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.Box);
-            else if (button == butDeath)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.Death);
-            else if (button == butMonkey)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.Monkey);
-            else if (button == butFlagBeetle)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.Beetle);
-            else if (button == butFlagTriggerTriggerer)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.TriggerTriggerer);
-            else if (button == butNotWalkableBox)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.NotWalkableFloor);
-            else if (button == butPortal)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.Portal);
-            else if (button == butForceSolidFloor)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.ForceFloorSolid);
-            else if (button == butClimbNegativeX ||
-                     button == butClimbNegativeZ ||
-                     button == butClimbPositiveX ||
-                     button == butClimbPositiveZ)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.Climb);
-            else if (button == butWall)
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.Wall);
-            else
-                _editor.SectorColoringManager.SetPriority(SectorColoringType.Trigger);
-        }
-    }
-}
diff --git a/TombEditor/ToolWindows/ToolPalette.cs b/TombEditor/ToolWindows/ToolPalette.cs
deleted file mode 100644
index ee5a1d2764..0000000000
--- a/TombEditor/ToolWindows/ToolPalette.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using DarkUI.Docking;
-using System;
-
-namespace TombEditor.ToolWindows
-{
-    public partial class ToolPalette : DarkToolWindow
-    {
-        public ToolPalette()
-        {
-            InitializeComponent();
-        }
-
-        private void toolBox_SizeChanged(object sender, EventArgs e)
-        {
-            AutoSize = true;
-        }
-    }
-}
diff --git a/TombEditor/ToolWindows/ToolPaletteFloating.cs b/TombEditor/ToolWindows/ToolPaletteFloating.cs
deleted file mode 100644
index 0f72e748af..0000000000
--- a/TombEditor/ToolWindows/ToolPaletteFloating.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using DarkUI.Controls;
-using System;
-
-namespace TombEditor.ToolWindows
-{
-    public partial class ToolPaletteFloating : DarkFloatingToolbox
-    {
-        public ToolPaletteFloating()
-        {
-            InitializeComponent();
-        }
-
-        private void toolBox_SizeChanged(object sender, EventArgs e)
-        {
-            AutoSize = true;
-        }
-    }
-}
diff --git a/TombLib/TombLib.WPF/LocalizeExtension.cs b/TombLib/TombLib.WPF/LocalizeExtension.cs
index a430b23332..8fefa91744 100644
--- a/TombLib/TombLib.WPF/LocalizeExtension.cs
+++ b/TombLib/TombLib.WPF/LocalizeExtension.cs
@@ -79,6 +79,7 @@ private string ResolveKey(IServiceProvider serviceProvider)
 
 	/// <summary>
 	/// Builds a full localization key from the target type and the provided key.
+	/// <para>The class name is used as-is for the component segment; known component suffixes (View, Window, Page, Dialog) are automatically trimmed by <see cref="Localizer"/> during the actual key lookup.</para>
 	/// </summary>
 	/// <param name="targetType">The type to extract namespace and class name from.</param>
 	/// <returns>The full localization key.</returns>
diff --git a/TombLib/TombLib.WPF/Localizer.cs b/TombLib/TombLib.WPF/Localizer.cs
index 0f607c950d..92fec2d58e 100644
--- a/TombLib/TombLib.WPF/Localizer.cs
+++ b/TombLib/TombLib.WPF/Localizer.cs
@@ -26,6 +26,8 @@ public sealed class Localizer : INotifyPropertyChanged
 
 	private readonly object _lockObject = new();
 
+	private static readonly string[] ComponentSuffixes = new[] { "View", "Window", "Page", "Dialog" };
+
 	private readonly HashSet<string> _preloadedFiles = new()
 	{
 		"Common",
@@ -37,9 +39,12 @@ public sealed class Localizer : INotifyPropertyChanged
 
 	/// <summary>
 	/// Gets the localized string for the specified key.
-	/// Returns a fallback string in the format "{Language}:{key}" if the key is not found.
+	/// Returns a fallback string if the key is not found.
 	/// </summary>
-	/// <param name="key">The localization key in the format "FileName.NestedKey" or "FileName.Parent.Child".</param>
+	/// <param name="key">
+	/// The localization key in the format "FileName.NestedKey" or "FileName.Component.Key".
+	/// Component suffixes (View, Window, Page, Dialog) are automatically trimmed from the component name part (second segment).
+	/// </param>
 	/// <returns>The localized string value, or a fallback string if not found.</returns>
 	public string this[string key]
 	{
@@ -232,6 +237,10 @@ private static bool LoadJsonFile(string filePath, out JsonElement rootElement)
 
 		string potentialFileName = keyParts[0];
 
+		// Trim component suffixes from the second segment (the view/component name).
+		if (keyParts.Length >= 3)
+			keyParts[1] = TrimComponentSuffix(keyParts[1]);
+
 		lock (_lockObject)
 		{
 			// Try to load the file if it's not in cache
@@ -283,6 +292,20 @@ private static string ProcessLocalizedValue(string value)
 	private static string CreateFallbackString(string key)
 		=> key.Split('.')[^1];
 
+	/// <summary>
+	/// Trims known component suffixes (View, Window, Page, Dialog).
+	/// </summary>
+	private static string TrimComponentSuffix(string componentName)
+	{
+		foreach (string suffix in ComponentSuffixes)
+		{
+			if (componentName.Length > suffix.Length && componentName.EndsWith(suffix, StringComparison.Ordinal))
+				return componentName[..^suffix.Length];
+		}
+
+		return componentName;
+	}
+
 	public event PropertyChangedEventHandler? PropertyChanged;
 
 	/// <summary>
diff --git a/TombLib/TombLib.WPF/Resources/Localization/EN/TombEditor.json b/TombLib/TombLib.WPF/Resources/Localization/EN/TombEditor.json
index 92d1e40afb..8695fad225 100644
--- a/TombLib/TombLib.WPF/Resources/Localization/EN/TombEditor.json
+++ b/TombLib/TombLib.WPF/Resources/Localization/EN/TombEditor.json
@@ -1,11 +1,8 @@
 {
-    "ContentBrowserView": {
+    "ContentBrowser": {
         "SearchPlaceholder": "Search assets...",
         "EmptyStateMessage": "Click here to load a new WAD file.",
-        "Size": "Size"
-    },
-
-    "ContentBrowser": {
+        "Size": "Size",
         "FilterAll": "All",
         "FilterMoveables": "Moveables",
         "FilterStatics": "Statics",
@@ -20,7 +17,7 @@
         "ItemCount": "{0} items"
     },
 
-    "ObjectBrushToolboxView": {
+    "ObjectBrushToolbox": {
         "Radius": "Radius:",
         "Density": "Density:",
         "Rotation": "Rotation:",
@@ -34,25 +31,18 @@
     },
 
     "FlybyTimeline": {
-        "PlaySequenceTooltip": "Play sequence",
-        "StopSequenceTooltip": "Stop sequence",
-        "RemoveSequenceConfirmationTitle": "Confirm delete",
-        "RemoveSequenceConfirmationMessage": "Deleting sequence {0} will remove {1} flyby camera(s). Continue?"
-    },
-
-    "FlybyTimelineView": {
         "PlayheadTimecodeTooltip": "Playhead timecode (MM:SS.CC)",
         "SequenceTooltip": "Flyby sequence",
         "AddSequenceTooltip": "Add new sequence",
         "RemoveSequenceTooltip": "Remove current sequence",
-        "AddCameraTooltip": "Add camera at current view position"
-    },
-
-    "ToolBox": {
-        "GridPaint": "Grid Paint ({0})"
+        "AddCameraTooltip": "Add camera at current view position",
+        "PlaySequenceTooltip": "Play sequence",
+        "StopSequenceTooltip": "Stop sequence",
+        "RemoveSequenceConfirmationTitle": "Confirm delete",
+        "RemoveSequenceConfirmationMessage": "Deleting sequence {0} will remove {1} flyby camera(s). Continue?"
     },
 
-    "ToolBoxView": {
+    "Toolbox": {
         "CircleBrushShape": "Circle Brush Shape",
         "SquareBrushShape": "Square Brush Shape",
         "Selection": "Selection",
@@ -78,6 +68,495 @@
         "Invisibility": "Invisibility",
         "PortalDigger": "Portal Digger",
         "FixTextureCoordinates": "Fix Texture Coordinates",
-        "ShowTextures": "Show Textures"
+        "ShowTextures": "Show Textures",
+        "GridPaint": "Grid Paint ({0})"
+    },
+
+    "MainWindow": {
+        "FileMenu": {
+            "File": "File",
+            "NewLevel": "New level",
+            "OpenLevel": "Open existing level...",
+            "OpenRecent": "Open recent",
+            "SaveLevel": "Save level",
+            "SaveLevelAs": "Save level as...",
+            "ImportPrj": "Import TRLE level...",
+            "ConvertLevelToTombEngine": "Convert level to TombEngine...",
+            "BuildAndPlay": "Build level and play",
+            "BuildLevel": "Build level",
+            "QuitEditor": "Quit editor"
+        },
+
+        "EditMenu": {
+            "Edit": "Edit",
+            "Undo": "Undo",
+            "Redo": "Redo",
+            "Cut": "Cut",
+            "Copy": "Copy",
+            "Paste": "Paste",
+            "StampObject": "Stamp object",
+            "Delete": "Delete",
+            "SelectAll": "Select all",
+            "BookmarkObject": "Bookmark object",
+            "SelectBookmarkedObject": "Select bookmarked object",
+            "EditObject": "Edit object properties...",
+            "EditVolumeEventSets": "Edit volume event sets...",
+            "EditGlobalEventSets": "Edit global event sets...",
+            "Search": "Search...",
+            "SearchAndReplaceObjects": "Search and replace objects..."
+        },
+
+        "ViewMenu": {
+            "View": "View",
+            "ResetCamera": "Reset camera position",
+            "RelocateCamera": "Relocate camera",
+            "ToggleFlyMode": "Toggle fly mode",
+            "DrawWhiteTextureLightingOnly": "Draw untextured in lighting mode",
+            "ShowRealTintForObjects": "Show real tint for objects"
+        },
+
+        "RoomsMenu": {
+            "Rooms": "Rooms",
+            "NewRoom": "New room",
+            "NewRoomUp": "New room up",
+            "NewRoomDown": "New room down",
+            "NewRoomLeft": "New room left",
+            "NewRoomRight": "New room right",
+            "NewRoomFront": "New room front",
+            "NewRoomBack": "New room back",
+            "DuplicateRoom": "Duplicate rooms",
+            "CropRoom": "Crop room...",
+            "SplitRoom": "Split room",
+            "MergeRoomsHorizontally": "Merge rooms horizontally",
+            "DeleteRooms": "Delete rooms",
+            "MoveRooms": "Move rooms",
+            "MoveRoomUp": "Move rooms up",
+            "MoveRoomUp4Clicks": "Move rooms up (4 clicks)",
+            "MoveRoomDown": "Move rooms down",
+            "MoveRoomDown4Clicks": "Move rooms down (4 clicks)",
+            "MoveRoomLeft": "Move rooms left",
+            "MoveRoomRight": "Move rooms right",
+            "MoveRoomForward": "Move rooms forward",
+            "MoveRoomBack": "Move rooms back",
+            "TransformRooms": "Transform rooms",
+            "RotateRoomsClockwise": "Rotate rooms clockwise",
+            "RotateRoomsCounterClockwise": "Rotate rooms counter-clockwise",
+            "MirrorRoomsX": "Mirror rooms on X axis",
+            "MirrorRoomsZ": "Mirror rooms on Z axis",
+            "SelectRooms": "Select rooms",
+            "SelectWaterRooms": "Select water rooms",
+            "SelectSkyRooms": "Select sky rooms",
+            "SelectOutsideRooms": "Select outside rooms",
+            "SelectQuicksandRooms": "Select quicksand rooms",
+            "SelectConnectedRooms": "Select connected rooms",
+            "SelectRoomsByTags": "Select rooms by tags",
+            "ExportRooms": "Export rooms...",
+            "ImportRooms": "Import rooms...",
+            "ApplyRoomProperties": "Apply room properties..."
+        },
+
+        "ItemsMenu": {
+            "Items": "Items",
+            "AddWad": "Add wad...",
+            "RemoveWads": "Remove all wads",
+            "ReloadWads": "Reload all wads",
+            "ReloadSounds": "Reload all sound catalogs",
+            "AddItem": "Add item",
+            "AddCamera": "Add camera",
+            "AddFlybyCamera": "Add flyby camera",
+            "AddSprite": "Add sprite",
+            "AddSink": "Add sink",
+            "AddSoundSource": "Add sound source",
+            "AddImportedGeometry": "Add imported geometry",
+            "AddGhostBlock": "Add ghost block",
+            "AddMemo": "Add memo",
+            "AddPortal": "Add portal",
+            "AddTrigger": "Add trigger...",
+            "AddBoxVolume": "Add box volume",
+            "AddSphereVolume": "Add sphere volume",
+            "DeleteAllLights": "Delete all lights in selected rooms",
+            "DeleteAllObjects": "Delete all objects in selected rooms",
+            "DeleteAllTriggers": "Delete all triggers in selected rooms",
+            "DeleteMissingObjects": "Delete missing objects",
+            "LocateItem": "Locate item",
+            "MoveLara": "Move Lara here",
+            "SelectAllObjectsInArea": "Select all objects in selected area",
+            "SelectFloorBelowObject": "Select floor below current object",
+            "SplitSectorObjectOnSelection": "Split sector based object on selection",
+            "SetStaticMeshesColorToRoomLight": "Set room static meshes color to room light",
+            "SetStaticMeshesColor": "Set room static meshes color",
+            "MakeQuickItemGroup": "Make quick itemgroup",
+            "GetObjectStatistics": "Copy object statistics into clipboard",
+            "GenerateObjectNames": "Generate Lua names for unnamed objects"
+        },
+
+        "TexturesMenu": {
+            "Textures": "Textures",
+            "AddTexture": "Add texture...",
+            "RemoveTextures": "Remove all textures",
+            "UnloadTextures": "Unload all textures",
+            "ReloadTextures": "Reload all textures",
+            "ConvertTexturesToPNG": "Convert all textures to PNG",
+            "RemapTexture": "Remap texture...",
+            "TextureFloor": "Texture floor",
+            "TextureWalls": "Texture walls",
+            "TextureCeiling": "Texture ceiling",
+            "ClearAllTexturesInRoom": "Clear all textures in room",
+            "ClearAllTexturesInLevel": "Clear all textures in level",
+            "SearchTextures": "Search textures...",
+            "EditAnimationRanges": "Edit animation ranges..."
+        },
+
+        "TransformMenu": {
+            "Transform": "Transform",
+            "IncreaseStepHeight": "Increase step height",
+            "DecreaseStepHeight": "Decrease step height",
+            "SmoothRandomFloorUp": "Smooth random floor up",
+            "SmoothRandomFloorDown": "Smooth random floor down",
+            "SmoothRandomCeilingUp": "Smooth random ceiling up",
+            "SmoothRandomCeilingDown": "Smooth random ceiling down",
+            "SharpRandomFloorUp": "Sharp random floor up",
+            "SharpRandomFloorDown": "Sharp random floor down",
+            "SharpRandomCeilingUp": "Sharp random ceiling up",
+            "SharpRandomCeilingDown": "Sharp random ceiling down",
+            "AverageFloor": "Average floor",
+            "AverageCeiling": "Average ceiling",
+            "FlattenFloor": "Flatten floor",
+            "FlattenCeiling": "Flatten ceiling",
+            "ResetGeometry": "Reset all geometry",
+            "GridWallsIn3": "Grid walls in 3",
+            "GridWallsIn5": "Grid walls in 5",
+            "GridWallsIn3Squares": "Grid walls in 3 (squares)",
+            "GridWallsIn5Squares": "Grid walls in 5 (squares)"
+        },
+
+        "ToolsMenu": {
+            "Tools": "Tools",
+            "EditLevelSettings": "Level settings...",
+            "EditOptions": "Editor options...",
+            "EditKeyboardLayout": "Edit keyboard layout...",
+            "StartWadTool": "Start Wad Tool...",
+            "StartSoundTool": "Start Sound Tool..."
+        },
+
+        "WindowMenu": {
+            "Window": "Window",
+            "RestoreDefaultLayout": "Restore default layout",
+            "ShowSectorOptions": "Sector Options",
+            "ShowRoomOptions": "Room Options",
+            "ShowItemBrowser": "Item Browser",
+            "ShowImportedGeometryBrowser": "Imported Geometry Browser",
+            "ShowTriggerList": "Trigger List",
+            "ShowLighting": "Lighting",
+            "ShowPalette": "Palette",
+            "ShowTexturePanel": "Texture Panel",
+            "ShowObjectList": "Object List",
+            "ShowStatistics": "Statistics",
+            "ShowToolPalette": "Tool Palette",
+            "ShowToolPaletteFloating": "Tool Palette (floating)"
+        },
+
+        "HelpMenu": {
+            "Help": "Help",
+            "About": "About Tomb Editor..."
+        }
+    },
+
+    "SectorOptions": {
+        "SetFloor": "Set floor",
+        "SetCeiling": "Set ceiling",
+        "SetBox": "Set box sector property",
+        "SetNotWalkable": "Set non-walkable floor",
+        "SetMonkeyswing": "Set monkeyswing sector property",
+        "SetDeath": "Set death sector property",
+        "AddPortal": "Add portal",
+        "SetWall": "Set wall",
+        "SetTriggerTriggerer": "Set trigger triggerer / minecart left (TR3)",
+        "SetBeetleCheckpoint": "Set beetle checkpoint / minecart right (TR3)",
+        "SetClimbPositiveZ": "Climb on North sector side",
+        "SetClimbNegativeZ": "Climb on South sector side",
+        "SetClimbNegativeX": "Climb on West sector side",
+        "SetClimbPositiveX": "Climb on East sector side",
+        "AddGhostBlocksToSelection": "Add ghost blocks to selected area",
+        "ToggleForceFloorSolid": "Force solid floor",
+        "FloorStep": "Floor step",
+        "CeilingStep": "Ceiling step",
+        "DiagonalWall": "Diag wall"
+    },
+
+    "RoomOptions": {
+        "EmptyRoom": "--- Empty room ---",
+        "Tags": "Tags:",
+        "RoomType": "Room type",
+        "Flipmap": "Flipmap",
+        "Reverb": "Reverb",
+        "FlipmapNone": "None",
+        "Skybox": "Skybox",
+        "Wind": "Wind",
+        "Damage": "Damage",
+        "Cold": "Cold",
+        "NoPathfinding": "No pathfinding",
+        "NoLensflare": "No lensflare",
+        "NoCaustics": "No caustics",
+        "Ambient": "Ambient",
+        "PortalShade": "Portal shade",
+        "Effect": "Effect:"
+    },
+
+    "Lighting": {
+        "TypePoint": "Point",
+        "TypeShadow": "Shadow",
+        "TypeSpot": "Spot",
+        "TypeEffect": "Effect",
+        "TypeSun": "Sun",
+        "TypeFogBulb": "Fog bulb",
+        "DefaultQuality": "Default quality",
+        "Enabled": "Enabled",
+        "Obstruct": "Obstruct",
+        "Shadow": "Shadow",
+        "Static": "Static",
+        "Dynamic": "Dynamic",
+        "Imported": "Imported",
+        "Color": "Color",
+        "Intensity": "Intensity",
+        "InnerDistance": "In d",
+        "OuterDistance": "Out d",
+        "InnerAngle": "In \u03b1",
+        "OuterAngle": "Out \u03b1",
+        "DirectionY": "Dir Y",
+        "DirectionX": "Dir X"
+    },
+
+    "ItemBrowser": {
+        "LocateItem": "Locate item"
+    },
+
+    "ImportedGeometryBrowser": {
+        "LocateItem": "Locate item"
+    },
+
+    "TexturePanel": {
+        "Animations": "Animations",
+        "Sounds": "Sounds",
+        "Bumpmaps": "Bumpmaps",
+        "Materials": "Materials"
+    },
+
+    "AnimatedTexturesWindow": {
+        "AnimatedTexturesTitle": "Animated textures",
+        "AnimationSet": "Animation set:",
+        "EditSetButton": "Edit Animation set name",
+        "AddSetButton": "Add animation set",
+        "DeleteSetButton": "Delete animation set",
+        "Image": "Image",
+        "Texture": "Texture",
+        "Repeat": "Repeat",
+        "Area": "Area",
+        "Edge0": "Edge 0",
+        "Edge1": "Edge 1",
+        "Edge2": "Edge 2",
+        "Edge3": "Edge 3",
+        "EditFrameButton": "Replace frame with selected texture",
+        "AddFrameButton": "Add frame",
+        "DeleteFrameButton": "Delete frame",
+        "PrevFrame": "Select previous frame",
+        "NextFrame": "Select next frame",
+        "ProcAnimTool": "Procedural animation tool",
+        "Animator": "Animator:",
+        "ProgressPerc": "Progress %:",
+        "StretchHorizontal": "Stretch horizontal",
+        "StretchVertical": "Stretch vertical",
+        "Scale": "Scale",
+        "SkewHorizontalRL": "Skew horizontal \u2196",
+        "SkewHorizontalLR": "Skew horizontal \u2197",
+        "SkewVerticalRL": "Skew vertical \u2196",
+        "SkewVerticalLR": "Skew horizontal \u2197",
+        "Spin": "Spin",
+        "PanHorizontal": "Pan horizontal",
+        "PanVertical": "Pan vertical",
+        "Shake": "Shake",
+        "Symmetric": "Symmetric",
+        "Smooth": "Smooth",
+        "Setting": "Setting",
+        "Type": "Type:",
+        "DefaultUVRotate": "Default (from script)",
+        "Preview": "Preview"
+    },
+
+    "BumpMapsWindow": {
+        "BumpmapsTitle": "Bumpmaps",
+        "UseCustomFile": "Use custom file:",
+        "CustomMapPath": "path to custom file",
+        "BumpmapsNone": "None",
+        "BumpmapsLevel1": "Level 1",
+        "BumpmapsLevel2": "Level 2",
+        "BumpmapsLevel3": "Level 3",
+        "AssignBumpmap": "Assign bumpmap"
+    },
+
+    "CameraWindow": {
+        "CameraTitle": "Edit camera",
+        "CameraGlideTimer": "Glide timer:",
+        "CameraGlideOut": "Glide out",
+        "CameraMode": "Camera mode:",
+        "CameraDefault": "Default",
+        "CameraLocked": "Locked"
+    },
+
+    "ChooseRoomWindow": {
+        "ChooseRoomTitle": "Choose a room",
+        "ChooseRoomtitleLabel": "titleLabel"
+    },
+
+    "FindTexturesWindow": {
+        "FindTexturesTitle": "Search textures",
+        "FindTexturesGridColRoom": "Room",
+        "FindTexturesGridBlock": "Block",
+        "FindTexturesFind": "Find",
+        "UntexturedFaces": "Untextured faces",
+        "InvisibleFaces": "Invisible faces",
+        "TexturesMissing": "Textures missing or out of bounds",
+        "ExactMatch": "Exact match with selected texture",
+        "PartialMatch": "Partial match with selected texture",
+        "TextureSetOnly": "Texture set only",
+        "SelectedRooms": "Selected rooms only",
+        "NewSearch": "New search"
+    },
+
+    "FlybyCameraWindow": {
+        "FlybyCameraTitle": "Flyby Camera",
+        "Sequence": "Sequence:",
+        "Number": "Number:",
+        "Timer": "Timer:",
+        "Speed": "Speed:",
+        "FOV": "FOV:",
+        "Roll": "Roll:",
+        "RotationX": "Rotation X:",
+        "RotationY": "Rotation Y:",
+        "cbBit0": "Make a cut to flyby from Lara camera position",
+        "cbBit1": "Track entity position",
+        "cbBit1TR5": "Vignette",
+        "cbBit2": "Infinite loop",
+        "cbBit3": "Create tracking camera",
+        "cbBit4": "Focus on Lara's last head position",
+        "cbBit4TR5": "Hide Lara",
+        "cbBit5": "Focus on Lara's head",
+        "cbBit6": "Snap back to Lara at the end of sequence",
+        "cbBit7": "Jump to another camera in sequence (Timer field)",
+        "cbBit8": "Freeze camera (Timer field)",
+        "cbBit9": "Disable exit from sequence with 'Look At' key",
+        "cbBit10": "Cinematic mode",
+        "cbBit11": "Let Lara move in cinematic mode",
+        "cbBit12": "Make fade-in",
+        "cbBit13": "Make fade-out",
+        "cbBit14": "Activate heavy trigger"
+    },
+
+    "FootStepSoundsWindow": {
+        "TextureSoundsTitle": "Texture sounds",
+        "Mud": "Mud",
+        "Snow": "Snow",
+        "Sand": "Sand",
+        "Gravel": "Gravel",
+        "Ice": "Ice",
+        "Water": "Water",
+        "Stone": "Stone",
+        "Wood": "Wood",
+        "Metal": "Metal",
+        "Marble": "Marble",
+        "Grass": "Grass",
+        "Concrete": "Concrete",
+        "OldWood": "Old Wood",
+        "OldMetal": "Old Metal",
+        "Custom1": "Custom 1",
+        "Custom2": "Custom 2",
+        "Custom3": "Custom 3",
+        "Custom4": "Custom 4",
+        "Custom5": "Custom 5",
+        "Custom6": "Custom 6",
+        "Custom7": "Custom 7",
+        "Custom8": "Custom 8",
+        "AssignSound": "Assign sound"
+    },
+
+    "TriggerWindow": {
+        "TriggerTitle": "Trigger",
+        "TriggerType": "Trigger Type:",
+        "What": "What:",
+        "Param": "(#) Param:",
+        "WrongParameter": "Wrong parameter:",
+        "Locate": "Locate",
+        "Time": "(&) Time:",
+        "Extra": "(E) Extra:",
+        "OneShot": "One Shot",
+        "RawMode": "Raw mode (show numeric values"
+    },
+
+    "ImportedGeometryWindow": {
+        "ImportedGeometry": "Imported Geometry Settings",
+        "IGDescription1": "Select a model from the following list or add a new one by pressing plus button.",
+        "IGDescription2": "Double-click on entry or press 'Assign' to assign the loaded file to this imported geometry object."
+    },
+
+    "ImportedGeometryManager": {
+        "IGName": "Name",
+        "IGNameToolTip": "Name...",
+        "IGPath": "Path",
+        "IGPathToolTip": "Path...",
+        "BrowseToolTip": "Browse...",
+        "ScaleToolTip": "Scale...",
+        "MessageToolTip": "Message...",
+        "SwapXY": "X\u2194Y",
+        "SwapXYToolTip": "Swap X-Y axis",
+        "SwapXZ": "X\u2194Z",
+        "SwapXZToolTip": "Swap X-Z axis",
+        "SwapYZ": "Y\u2194Z",
+        "SwapYZToolTip": "Swap Y-Z axis",
+        "FlipX": "-X",
+        "FlipXToolTip": "Invert X axis",
+        "FlipY": "-Y",
+        "FlipYToolTip": "Invert Y axis",
+        "FlipZ": "-Z",
+        "FlipZToolTip": "Invert Z axis",
+        "MappedUV": "UV Map",
+        "MappedUVToolTip": "Use UV mapping",
+        "FlipUV_V": "UV: -V",
+        "FlipUV_VToolTip": "Invert V texture coordinate",
+        "InvertFaces": "Inv. F.",
+        "InvertFacesToolTip": "Invert faces"
+    },
+
+    "ImportPrjWindow": {
+        "ImportPrjTitle": "Import Prj",
+        "ImportSettings": "Import settings",
+        "BaseSound": "Base sound catalog (optional)",
+        "T4Larson": "Respect T4Larson's mousepatch flyby handling",
+        "T4LarsonDescr": "If you've used a patch which increased maximum amount of flyby sequences in winroomedit, use this option, otherwise flyby indices will be corrupted.",
+        "UseHalfPixelCorrection": "Use half-pixel UV correction",
+        "UseHalfPixelCorrectionDescr": "Legacy texture cropping to prevent border bleeding. Use only if you are about to turn off advanced texture padding in Level settings.",
+        "BrowseP": "Browse...",
+        "SoundCatalog": "Specifiy sound catalog (sounds.txt or xml file). If not specified, legacy SFX/SAM files provided with specified WAD will be used."
+    },
+
+    "KeyboardLayoutWindow": {
+        "KeyboardLayoutTitle": "Keyboard Layout",
+        "SearchCommand": "Search for command:",
+        "TypeCommand": "Type",
+        "Command": "Command",
+        "AddCommand": "Add Command",
+        "DeleteCommand": "Delete Command",
+        "Hotkeys": "Hotkeys",
+        "SetToDefault": "Set all to default",
+        "CancelPush": "Push keys! Click here to cancel!"
+    },
+
+    "Generic": {
+        "OK": "OK",
+        "Cancel": "Cancel",
+        "Close": "Close",
+        "Unused": "Unused",
+        "Frames": "Frames",
+        "Browse": "Browse",
+        "Message": "Message"
     }
 }
diff --git a/TombLib/TombLib.WPF/Services/Abstract/ILocalizationService.cs b/TombLib/TombLib.WPF/Services/Abstract/ILocalizationService.cs
index 7c73bde1b2..fbdd0c24ff 100644
--- a/TombLib/TombLib.WPF/Services/Abstract/ILocalizationService.cs
+++ b/TombLib/TombLib.WPF/Services/Abstract/ILocalizationService.cs
@@ -17,6 +17,7 @@ public interface ILocalizationService
 	/// <summary>
 	/// Gets the current component name used as a prefix for localization keys.
 	/// <para>This value is added between the namespace and the actual key when resolving translations.</para>
+	/// <para>Known component suffixes (View, Window, Page, Dialog) are automatically trimmed by <see cref="Localizer"/> during key resolution.</para>
 	/// </summary>
 	/// <value>The component name, or <see langword="null" /> if no component is set.</value>
 	string? ComponentName { get; }
@@ -34,7 +35,7 @@ public interface ILocalizationService
 	/// <para>This method extracts localization context as follows:</para>
 	/// <list type="bullet">
 	/// <item><description><c>NamespaceName</c>: Set to the first segment of <paramref name="viewModel"/>'s namespace (e.g., "TombEditor" from "TombEditor.ViewModels")</description></item>
-	/// <item><description><c>ComponentName</c>: Set to the view model's type name with "ViewModel" suffix removed (e.g., "MainWindow" from "MainWindowViewModel")</description></item>
+	/// <item><description><c>ComponentName</c>: Set to the view model's type name with "ViewModel" suffix removed (e.g., "MainWindow" from "MainWindowViewModel", or "SettingsView" from "SettingsViewViewModel"). Known component suffixes (View, Window, Page, Dialog) are then further trimmed by <see cref="Localizer"/> during key resolution.</description></item>
 	/// </list>
 	/// <para>These values are then used to automatically prefix localization keys when using the indexer.</para>
 	/// </remarks>
diff --git a/TombLib/TombLib.WPF/WPFUtils.cs b/TombLib/TombLib.WPF/WPFUtils.cs
new file mode 100644
index 0000000000..81343eb2c7
--- /dev/null
+++ b/TombLib/TombLib.WPF/WPFUtils.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Numerics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace TombLib.WPF;
+
+public static class WPFUtils
+{
+	public static System.Windows.Forms.IWin32Window? GetWin32WindowFromCaller(INotifyPropertyChanged caller)
+		=> System.Windows.Forms.Application.OpenForms.Count > 0 ? System.Windows.Forms.Application.OpenForms[0] : null;
+
+	public static Color ToWPFColor(this Vector3 color) => Color.FromRgb((byte)(color.X * 255.0f), (byte)(color.Y * 255.0f), (byte)(color.Z * 255.0f));
+	public static Color ToWPFColor(this Vector4 color) => Color.FromArgb((byte)(color.W * 255.0f), (byte)(color.X * 255.0f), (byte)(color.Y * 255.0f), (byte)(color.Z * 255.0f));
+
+	public static Brush ToWPFBrush(this Vector3 color) => new Vector4(color, 255.0f).ToWPFBrush();
+	public static Vector3 ToFloat3Color(this Color color) => new Vector3(color.R, color.G, color.B) / 255.0f;
+	public static Vector4 ToFloat4Color(this Color color) => new Vector4(color.R, color.G, color.B, color.A) / 255.0f;
+
+	public static Brush ToWPFBrush(this Vector4 color, float? alpha = null)
+	{
+		return new SolidColorBrush(Color.FromArgb(
+			(byte)Math.Max(0, Math.Min(255, Math.Round((alpha.HasValue ? Math.Clamp(alpha.Value, 0.0, 1.0) : color.W) * 255.0f))),
+			(byte)Math.Max(0, Math.Min(255, Math.Round(color.X * 255.0f))),
+			(byte)Math.Max(0, Math.Min(255, Math.Round(color.Y * 255.0f))),
+			(byte)Math.Max(0, Math.Min(255, Math.Round(color.Z * 255.0f)))));
+	}
+
+	public static Brush ToWPFBrush(this Vector3 color, float alpha)
+	{
+		return ToWPFBrush(new Vector4(color.X, color.Y, color.Z, alpha));
+	}
+
+	public static float GetBrightness(this Brush b)
+	{
+		if (b is SolidColorBrush scb)
+		{
+			Color c = scb.Color;
+			return System.Drawing.Color.FromArgb(c.A, c.R, c.G, c.B).GetBrightness();
+		}
+		else
+		{
+			return 1.0f;
+		}
+	}
+
+	public static Pen CreateFrozenPen(Color color, double thickness)
+	{
+		var brush = new SolidColorBrush(color);
+		brush.Freeze();
+		var pen = new Pen(brush, thickness);
+		pen.Freeze();
+		return pen;
+	}
+
+	public static SolidColorBrush CreateFrozenBrush(Color color)
+	{
+		var brush = new SolidColorBrush(color);
+		brush.Freeze();
+		return brush;
+	}
+
+	public static IEnumerable<Control> AllSubControls(DependencyObject depObj)
+	{
+		if (depObj == null)
+			yield return (Control)Enumerable.Empty<Control>();
+
+		foreach (var child in LogicalTreeHelper.GetChildren(depObj))
+		{
+			if (child is DependencyObject dpo)
+			{
+				if (child is Control t)
+					yield return t;
+
+				foreach (Control childOfChild in AllSubControls(dpo))
+					yield return childOfChild;
+			}
+		}
+	}
+}
diff --git a/WadTool/Program.cs b/WadTool/Program.cs
index 595dac687d..1acc234c41 100644
--- a/WadTool/Program.cs
+++ b/WadTool/Program.cs
@@ -25,10 +25,6 @@ static class Program
         [STAThread]
         public static void Main(string[] args)
         {
-            var services = WPFInitializer.InitializeWPF();
-            services.AddSingleton<ICustomGeometrySettingsPresetIOService, CustomGeometrySettingsPresetIOService>();
-            ServiceLocator.Configure(services.BuildServiceProvider());
-
             Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
             // Load configuration
@@ -38,6 +34,10 @@ public static void Main(string[] args)
             // Update DarkUI configuration
             Colors.Brightness = configuration.UI_FormColor_Brightness / 100.0f;
 
+            var services = WPFInitializer.InitializeWPF();
+            services.AddSingleton<ICustomGeometrySettingsPresetIOService, CustomGeometrySettingsPresetIOService>();
+            ServiceLocator.Configure(services.BuildServiceProvider());
+
             // Setup logging
             using (var log = new Logging(configuration.Log_MinLevel, configuration.Log_WriteToFile, configuration.Log_ArchiveN, initialEvents))
             {