diff --git a/StageManager/3D/Panel3D.cs b/StageManager/3D/Panel3D.cs
deleted file mode 100644
index 3f7f491..0000000
--- a/StageManager/3D/Panel3D.cs
+++ /dev/null
@@ -1,349 +0,0 @@
-// TAKEN FROM https://joshsmithonwpf.wordpress.com/2008/03/30/animating-images-in-a-3d-itemscontrol/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Effects;
-using System.Windows.Media.Media3D;
-
-namespace StageManager;
-
-/// <summary>
-/// A Panel that displays its children in a 
-/// Viewport3D hosted in the adorner layer.
-/// </summary>
-public class Panel3D : Panel
-{
-	#region Data
-
-	static readonly Point ORIGIN_POINT = new Point(0, 0);
-
-	bool _isMovingItems;
-	int _registeredNameCounter = 0;
-	readonly Viewport3D _viewport;
-	readonly Dictionary<DependencyObject, ModelVisual3D> _visualTo3DModelMap = new Dictionary<DependencyObject, ModelVisual3D>();
-
-	#endregion // Data
-
-	#region Constructor
-
-	public Panel3D()
-	{
-		_viewport = Application.LoadComponent(new Uri("3D/Scene.xaml", UriKind.Relative)) as Viewport3D;
-
-		this.Loaded += delegate
-		{
-			var adornerLayer = AdornerLayer.GetAdornerLayer(this);
-			var adorner = new Panel3DAdorner(this, _viewport);
-			
-			adornerLayer.IsHitTestVisible = false;
-			adorner.IsHitTestVisible = false;
-
-			adornerLayer.Add(adorner);
-		};
-	}
-
-	protected override void OnInitialized(EventArgs e)
-	{
-		base.OnInitialized(e);
-		_viewport.DataContext = this.DataContext;
-	}
-
-	protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-	{
-		base.OnPropertyChanged(e);
-
-		if (e.Property.Name == nameof(IsMouseOver))
-			_viewport.Opacity = ((bool)e.NewValue) ? 1.0 : 0.8;
-		else if (e.Property.Name == nameof(IsVisible))
-			_viewport.Visibility = ((bool)e.NewValue) ? Visibility.Visible : Visibility.Hidden;
-	}
-
-	#endregion // Constructor
-
-	#region MoveItems
-
-	public void MoveItems(bool forward)
-	{
-		if (_isMovingItems)
-			return;
-
-		// We cannot move items less than two items.
-		if (_viewport.Children.Count < 2)
-			return;
-
-		#region Create Lists
-
-		// Get a list of all the GeometryModel3D and TranslateTransform3D objects in the viewport.
-		List<GeometryModel3D> geometries = new List<GeometryModel3D>();
-		List<TranslateTransform3D> transforms = new List<TranslateTransform3D>();
-		foreach (ModelVisual3D model in _viewport.Children)
-		{
-			GeometryModel3D geo = model.Content as GeometryModel3D;
-			if (geo != null)
-			{
-				geometries.Add(geo);
-				transforms.Add(geo.Transform as TranslateTransform3D);
-			}
-		}
-
-		#endregion // Create Lists
-
-		#region Relocate Target Item
-
-		// Move the first or last item to the opposite end of the list.
-		if (forward)
-		{
-			var firstGeo = geometries[0];
-			geometries.RemoveAt(0);
-			geometries.Add(firstGeo);
-
-			// The item at index 0 holds the scene's light
-			// so don't remove that, instead remove the first
-			// model that we added to the scene in code.
-			var firstChild = _viewport.Children[1];
-			_viewport.Children.RemoveAt(1);
-			_viewport.Children.Add(firstChild);
-		}
-		else
-		{
-			int idx = geometries.Count - 1;
-			var lastGeo = geometries[idx];
-			geometries.RemoveAt(idx);
-			geometries.Insert(0, lastGeo);
-
-			idx = _viewport.Children.Count - 1;
-			var lastChild = _viewport.Children[idx];
-			_viewport.Children.RemoveAt(idx);
-			_viewport.Children.Insert(1, lastChild);
-		}
-
-		#endregion // Relocate Target Item
-
-		#region Animate All Items to New Locations and Opacitys
-
-		Storyboard story = new Storyboard();
-
-		// Apply the new transforms via animations.
-		for (int i = 0; i < transforms.Count; ++i)
-		{
-			double targetX = transforms[i].OffsetX;
-			double targetY = transforms[i].OffsetY;
-			double targetZ = transforms[i].OffsetZ;
-
-			var trans = geometries[i].Transform as TranslateTransform3D;
-
-			// In order to animate the transform it must have a name registered 
-			// with the viewport.  Since a transform does not have a Name property
-			// I just create an arbitrary name for each transform and register that.
-			string name = this.GetNextName();
-			_viewport.RegisterName(name, trans);
-
-			Duration duration = new Duration(TimeSpan.FromSeconds(1.25));
-
-			DoubleAnimation animX = new DoubleAnimation();
-			animX.To = targetX;
-			animX.Duration = duration;
-			animX.AccelerationRatio = 0.1;
-			animX.DecelerationRatio = 0.9;
-			Storyboard.SetTargetProperty(animX, new PropertyPath("OffsetX"));
-			Storyboard.SetTargetName(animX, name);
-			story.Children.Add(animX);
-
-			DoubleAnimation animY = new DoubleAnimation();
-			animY.To = targetY;
-			animY.AccelerationRatio = 0.7;
-			animY.DecelerationRatio = 0.3;
-			animY.Duration = duration;
-			Storyboard.SetTargetProperty(animY, new PropertyPath("OffsetY"));
-			Storyboard.SetTargetName(animY, name);
-			story.Children.Add(animY);
-
-			DoubleAnimation animZ = new DoubleAnimation();
-			animZ.To = targetZ;
-			animZ.AccelerationRatio = 0.3;
-			animZ.DecelerationRatio = 0.7;
-			animZ.Duration = duration;
-			Storyboard.SetTargetProperty(animZ, new PropertyPath("OffsetZ"));
-			Storyboard.SetTargetName(animZ, name);
-			story.Children.Add(animZ);
-
-			DoubleAnimation animOpacity = new DoubleAnimation();
-			var material = geometries[i].Material as DiffuseMaterial;
-			var brush = material.Brush as VisualBrush;
-			name = this.GetNextName();
-			_viewport.RegisterName(name, brush);
-			animOpacity.To = 1.0 - (i / (double)transforms.Count);
-			animOpacity.AccelerationRatio = 0.2;
-			animOpacity.DecelerationRatio = 0.8;
-			animOpacity.Duration = duration;
-			Storyboard.SetTargetProperty(animOpacity, new PropertyPath("Opacity"));
-			Storyboard.SetTargetName(animOpacity, name);
-			story.Children.Add(animOpacity);
-
-			if (i == 0)
-				animX.Completed += delegate { _isMovingItems = false; };
-		}
-
-		_isMovingItems = true;
-		story.Begin(_viewport);
-
-		#endregion // Animate All Items to New Locations and Opacitys
-	}
-
-	string GetNextName()
-	{
-		return "name" + _registeredNameCounter++;
-	}
-
-	#endregion // MoveItems
-
-	#region DPs
-
-	public static readonly DependencyProperty ElementHeightProperty =
-		DependencyProperty.Register("ElementHeight", typeof(double), typeof(Panel3D),
-									new FrameworkPropertyMetadata(30.0));
-
-	public static readonly DependencyProperty ElementWidthProperty =
-		DependencyProperty.Register("ElementWidth", typeof(double), typeof(Panel3D),
-									new FrameworkPropertyMetadata(40.0));
-
-
-	public double ElementWidth
-	{
-		get { return (double)GetValue(ElementWidthProperty); }
-		set { SetValue(ElementWidthProperty, value); }
-	}
-
-	public double ElementHeight
-	{
-		get { return (double)GetValue(ElementHeightProperty); }
-		set { SetValue(ElementHeightProperty, value); }
-	}
-	#endregion
-
-	#region Layout Overrides
-
-	protected override Size ArrangeOverride(Size finalSize)
-	{
-		Size size = new Size(ElementWidth, ElementHeight);
-
-		// Arrange children so that their visualbrush has a valid width/height.
-		foreach (UIElement child in Children)
-			child.Arrange(new Rect(ORIGIN_POINT, size));
-
-		_viewport.Arrange(new Rect(ORIGIN_POINT, finalSize));
-
-		return finalSize;
-	}
-
-	protected override Size MeasureOverride(Size availableSize)
-	{
-		Size size = new Size(ElementWidth, ElementHeight);
-
-		foreach (UIElement child in Children)
-			child.Measure(size);
-
-		_viewport.Measure(availableSize);
-
-		if (availableSize.Width > 10000)
-			availableSize.Width = availableSize.Height;
-
-		if (availableSize.Height > 10000)
-			availableSize.Height = availableSize.Width;
-
-		return size;
-	}
-
-	#endregion  // Layout Overrides
-
-	#region OnVisualChildrenChanged
-
-	protected override void OnVisualChildrenChanged(DependencyObject visualAdded, DependencyObject visualRemoved)
-	{
-		base.OnVisualChildrenChanged(visualAdded, visualRemoved);
-
-		bool add = visualAdded != null && !_visualTo3DModelMap.ContainsKey(visualAdded);
-		if (add)
-		{
-			// effects the PerspectiveCamera in Scene.xaml like for 20 here its Position="-3,0,3.5" and for 100 its  Position="-1.7,0,2.1"
-			(visualAdded as ContentPresenter).Effect = new DropShadowEffect { BlurRadius = 30, Direction = 200 /* pretty leftish */ }; 
-			var model = Build3DModel(visualAdded as Visual);
-			_visualTo3DModelMap.Add(visualAdded, model);
-			_viewport.Children.Add(model);
-		}
-
-		bool remove = visualRemoved != null && _visualTo3DModelMap.ContainsKey(visualRemoved);
-		if (remove)
-		{
-			var model = _visualTo3DModelMap[visualRemoved];
-			_viewport.Children.Remove(model);
-			_visualTo3DModelMap.Remove(visualRemoved);
-		}
-	}
-
-	#endregion // OnVisualChildrenChanged
-
-	#region Build3DModel
-
-	ModelVisual3D Build3DModel(Visual visual)
-	{
-		double opacityDivisor = 1;
-			//_viewport.Children.Count > 0 ?
-			//_viewport.Children.Count : 1;
-			
-		var model = new ModelVisual3D
-		{
-			Content = new GeometryModel3D
-			{
-				Geometry = new MeshGeometry3D
-				{
-					TriangleIndices = new Int32Collection(
-						new int[] { 0, 1, 2, 2, 3, 0 }),
-					TextureCoordinates = new PointCollection(
-						new Point[]
-						{
-							new Point(0, 1),
-							new Point(1, 1),
-							new Point(1, 0),
-							new Point(0, 0)
-						}),
-					Positions = new Point3DCollection(
-						new Point3D[]
-						{
-							new Point3D(-1, -1, 0),
-							new Point3D(1, -1, 0),
-							new Point3D(1, 1, 0),
-							new Point3D(-1, 1, 0)
-						})
-				},
-				Material = new DiffuseMaterial
-				{
-					Brush = new VisualBrush
-					{
-						Visual = visual,
-						Opacity = 1.0 / opacityDivisor
-					}
-				},
-				Transform = new TranslateTransform3D
-				{
-					OffsetX = _viewport.Children.Count * 0.1,
-					OffsetY = 0,
-					OffsetZ = _viewport.Children.Count * 0.2
-				}
-			}
-		};
-
-		return model;
-	}
-
-	#endregion // Build3DModel
-}
-
diff --git a/StageManager/3D/Panel3DAdorner.cs b/StageManager/3D/Panel3DAdorner.cs
deleted file mode 100644
index 85a2900..0000000
--- a/StageManager/3D/Panel3DAdorner.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-using System.Windows.Media.Effects;
-
-namespace StageManager;
-
-/// <summary>
-/// Hosts an opaque Viewport3D in the adorner layer above a Panel3D.
-/// </summary>
-public class Panel3DAdorner : Adorner
-{
-	#region Data
-
-	private ArrayList _logicalChildren;
-	private readonly DockPanel _viewportHost = new DockPanel();
-
-	#endregion // Data
-
-	#region Constructor
-
-	public Panel3DAdorner(Panel3D adornedPanel3D, Viewport3D viewport)
-		: base(adornedPanel3D)
-	{
-		_viewportHost.Children.Add(viewport);
-		_viewportHost.Background = Brushes.Transparent;
-		base.AddLogicalChild(_viewportHost);
-		base.AddVisualChild(_viewportHost);
-
-
-	}
-
-	#endregion // Constructor
-
-	#region Measure/Arrange
-
-	///// <summary>
-	///// Allows the control to determine how big it wants to be.
-	///// </summary>
-	///// <param name="constraint">A limiting size for the control.</param>
-	//protected override Size MeasureOverride(Size constraint)
-	//{
-	//	//_viewport.Measure(constraint);
-	//	//return _viewport.DesiredSize;
-
-	//	//if (constraint.Width > 10000)
-	//	//	constraint.Width = constraint.Height;
-
-	//	//if (constraint.Height > 10000)
-	//	//	constraint.Height = constraint.Width;
-
-	//	//return constraint;
-
-	//	return new Size(100, 100);
-	//}
-
-	/// <summary>
-	/// Positions and sizes the control.
-	/// </summary>
-	/// <param name="finalSize">The actual size of the control.</param>		
-	protected override Size ArrangeOverride(Size finalSize)
-	{
-		Rect rect = new Rect(new Point(), finalSize);
-
-		_viewportHost.Arrange(rect);
-
-		return finalSize;
-	}
-
-	#endregion // Measure/Arrange
-
-	#region Visual Children
-
-	/// <summary>
-	/// Required for the element to be rendered.
-	/// </summary>
-	protected override int VisualChildrenCount
-	{
-		get { return 1; }
-	}
-
-	/// <summary>
-	/// Required for the element to be rendered.
-	/// </summary>
-	protected override Visual GetVisualChild(int index)
-	{
-		if (index != 0)
-			throw new ArgumentOutOfRangeException("index");
-
-		return _viewportHost;
-	}
-
-	#endregion // Visual Children
-
-	#region Logical Children
-
-	/// <summary>
-	/// Required for the displayed element to inherit property values
-	/// from the logical tree, such as FontSize.
-	/// </summary>
-	protected override IEnumerator LogicalChildren
-	{
-		get
-		{
-			if (_logicalChildren == null)
-			{
-				_logicalChildren = new ArrayList();
-				_logicalChildren.Add(_viewportHost);
-			}
-
-			return _logicalChildren.GetEnumerator();
-		}
-	}
-
-	#endregion // Logical Children
-}
\ No newline at end of file
diff --git a/StageManager/3D/Scene.xaml b/StageManager/3D/Scene.xaml
deleted file mode 100644
index 11ffdac..0000000
--- a/StageManager/3D/Scene.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<Viewport3D
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-	<Viewport3D.Camera>
-		<PerspectiveCamera
-			FieldOfView="48"
-			LookDirection="1.6,0,-3.1"
-            Position="-1.1,0,3.7"
-            UpDirection="0,1,0" />
-	</Viewport3D.Camera>
-	<ModelVisual3D>
-		<ModelVisual3D.Content>
-			<AmbientLight />
-		</ModelVisual3D.Content>
-	</ModelVisual3D>
-</Viewport3D>
\ No newline at end of file
diff --git a/StageManager/DwmThumbnail.xaml b/StageManager/DwmThumbnail.xaml
new file mode 100644
index 0000000..cde1d2d
--- /dev/null
+++ b/StageManager/DwmThumbnail.xaml
@@ -0,0 +1,21 @@
+<UserControl
+    x:Class="StageManager.DwmThumbnail"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:StageManager"
+    mc:Ignorable="d"
+    d:DesignHeight="450"
+    d:DesignWidth="800">
+    <Grid>
+        <Border>
+            <Border.Effect>
+                <DropShadowEffect
+                    BlurRadius="20" />
+            </Border.Effect>
+            <Rectangle
+                Fill="White" />
+        </Border>
+    </Grid>
+</UserControl>
diff --git a/StageManager/DwmThumbnail.xaml.cs b/StageManager/DwmThumbnail.xaml.cs
new file mode 100644
index 0000000..5fa0b12
--- /dev/null
+++ b/StageManager/DwmThumbnail.xaml.cs
@@ -0,0 +1,121 @@
+using StageManager.Native.Interop;
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace StageManager
+{
+	/// <summary>
+	/// Interaction logic for DwmThumbnail.xaml
+	/// </summary>
+	public partial class DwmThumbnail : UserControl
+	{
+		public DwmThumbnail()
+		{
+			InitializeComponent();
+			LayoutUpdated += DwmThumbnail_LayoutUpdated;
+		}
+
+		private IntPtr _dwmThumbnail;
+		private Window _window;
+		private Point? _dpiScaleFactor;
+
+		public static readonly DependencyProperty PreviewHandleProperty = DependencyProperty.Register(nameof(PreviewHandle),
+			   typeof(IntPtr),
+			   typeof(DwmThumbnail),
+			   new PropertyMetadata(IntPtr.Zero));
+
+		public IntPtr PreviewHandle
+		{
+			get { return (IntPtr)GetValue(PreviewHandleProperty); }
+			set { SetValue(PreviewHandleProperty, value); }
+		}
+
+		private Point GetDpiScaleFactor()
+		{
+			if (_dpiScaleFactor is null)
+			{
+				var source = PresentationSource.FromVisual(this);
+				_dpiScaleFactor = source?.CompositionTarget != null ? new Point(source.CompositionTarget.TransformToDevice.M11, source.CompositionTarget.TransformToDevice.M22) : new Point(1.0d, 1.0d);
+			}
+
+			return _dpiScaleFactor.Value;
+		}
+
+		protected override void OnDpiChanged(DpiScale oldDpi, DpiScale newDpi)
+		{
+			_dpiScaleFactor = null;
+			base.OnDpiChanged(oldDpi, newDpi);
+		}
+
+		protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
+		{
+			base.OnPropertyChanged(e);
+
+			if (nameof(PreviewHandle).Equals(e.Property.Name))
+			{
+				if ((IntPtr)e.OldValue == IntPtr.Zero && (IntPtr)e.NewValue != IntPtr.Zero)
+					StartCapture();
+
+				UpdateThumbnailProperties();
+			}
+
+			if (nameof(IsVisible).Equals(e.Property.Name) && !(bool)e.NewValue && _dwmThumbnail != IntPtr.Zero)
+			{
+				NativeMethods.DwmUnregisterThumbnail(_dwmThumbnail);
+				_dwmThumbnail = IntPtr.Zero;
+			}
+		}
+
+		private void DwmThumbnail_LayoutUpdated(object? sender, EventArgs e)
+		{
+			UpdateThumbnailProperties();
+		}
+
+		public static Rect BoundsRelativeTo(FrameworkElement element, Visual relativeTo)
+		{
+			return element.TransformToVisual(relativeTo)
+						  .TransformBounds(System.Windows.Controls.Primitives.LayoutInformation.GetLayoutSlot(element));
+		}
+
+		private void StartCapture()
+		{
+			var windowHandle = new System.Windows.Interop.WindowInteropHelper(FindWindow()).Handle;
+
+			var hr = NativeMethods.DwmRegisterThumbnail(windowHandle, PreviewHandle, out _dwmThumbnail);
+			if (hr != 0)
+				return;
+		}
+
+		private Window FindWindow() => _window ??= Window.GetWindow(this);
+
+		private void UpdateThumbnailProperties()
+		{
+			if (_dwmThumbnail == IntPtr.Zero)
+				return;
+
+			var dpi = GetDpiScaleFactor();
+
+			var previewBounds = BoundsRelativeTo(this, FindWindow());
+
+			var thumbnailRect = new RECT
+			{
+				top = (int)(previewBounds.Top * dpi.Y),
+				left = (int)(previewBounds.Left * dpi.X),
+				bottom = (int)((previewBounds.Bottom - Margin.Top - Margin.Bottom) * dpi.Y) + 1,
+				right = (int)((previewBounds.Right - Margin.Left - Margin.Right) * dpi.X) + 1
+			};
+
+			var props = new DWM_THUMBNAIL_PROPERTIES
+			{
+				fVisible = true,
+				dwFlags = (int)(DWM_TNP.DWM_TNP_VISIBLE | DWM_TNP.DWM_TNP_OPACITY | DWM_TNP.DWM_TNP_RECTDESTINATION | DWM_TNP.DWM_TNP_SOURCECLIENTAREAONLY),
+				opacity = 255,
+				rcDestination = thumbnailRect,
+				fSourceClientAreaOnly = true
+			};
+			NativeMethods.DwmUpdateThumbnailProperties(_dwmThumbnail, ref props);
+		}
+	}
+}
diff --git a/StageManager/MainWindow.xaml b/StageManager/MainWindow.xaml
index 247a5de..805d344 100644
--- a/StageManager/MainWindow.xaml
+++ b/StageManager/MainWindow.xaml
@@ -20,8 +20,8 @@
     Name="thisWindow">
     <Window.Resources>
         <Style
-            x:Key="GridOpacity"
-            TargetType="{x:Type Grid}">
+            x:Key="SceneOpacity"
+            TargetType="{x:Type StackPanel}">
             <Setter
                 Property="Opacity"
                 Value="0.8" />
@@ -47,13 +47,15 @@
         VerticalAlignment="Center">
         <ItemsControl
             Name="scenesControl"
+            HorizontalAlignment="Left"
             VerticalAlignment="Center"
+            Padding="12, 0, 0, 0"
             ItemsSource="{Binding Scenes}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <Grid
+                    <StackPanel Orientation="Vertical"
                         Visibility="{Binding Visibility}"
-                        Style="{StaticResource GridOpacity}">
+                        Style="{StaticResource SceneOpacity}">
                         <i:Interaction.Triggers>
                             <i:EventTrigger
                                 EventName="MouseLeftButtonUp">
@@ -62,28 +64,30 @@
                                     CommandParameter="{Binding .}" />
                             </i:EventTrigger>
                         </i:Interaction.Triggers>
+                        <!-- Windows -->
                         <ItemsControl
                             ItemsSource="{Binding Windows}">
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
-                                    <local:Panel3D
-                                        Margin="4"
-                                        ElementHeight="200"
-                                        ElementWidth="200"
-                                        Opacity="0"></local:Panel3D>
+                                    <Grid
+                                        Margin="0,0,0,0"></Grid>
                                 </ItemsPanelTemplate>
                             </ItemsControl.ItemsPanel>
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
-                                    <Image
-                                        Source="{Binding Image}" />
+                                    <local:DwmThumbnail
+                                        PreviewHandle="{Binding Handle}"
+                                        MinHeight="100"
+                                        MinWidth="150"
+                                        Margin="0, 0, 0, 0" />
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
                         </ItemsControl>
+                        <!-- Icons -->
                         <ItemsControl
-                            VerticalAlignment="Bottom"
-                            HorizontalAlignment="Left"
-                            Margin="30,0,0,00"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Center"
+                            Margin="0,4,0,24"
                             ItemsSource="{Binding Windows}">
                             <ItemsControl.ItemsPanel>
                                 <ItemsPanelTemplate>
@@ -99,14 +103,14 @@
                                                 BlurRadius="20" />
                                         </Border.Effect>
                                         <Image
-                                            Margin="2, 0, 0, 0"
-                                            Height="36"
+                                            Margin="0, 0, 0, 0"
+                                            Height="30"
                                             Source="{Binding Icon}" />
                                     </Border>
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>
                         </ItemsControl>
-                    </Grid>
+                    </StackPanel>
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
diff --git a/StageManager/MainWindow.xaml.cs b/StageManager/MainWindow.xaml.cs
index e0f1663..cdc37ce 100644
--- a/StageManager/MainWindow.xaml.cs
+++ b/StageManager/MainWindow.xaml.cs
@@ -4,6 +4,7 @@
 using StageManager.Model;
 using StageManager.Native;
 using StageManager.Native.PInvoke;
+using StageManager.Native.Interop;
 using StageManager.Native.Window;
 using System;
 using System.Collections.Generic;
@@ -57,7 +58,7 @@ protected override void OnInitialized(EventArgs e)
 			_thisHandle = new System.Windows.Interop.WindowInteropHelper(this).Handle;
 			_lastWidth = Width;
 
-			StartHook();
+			StartHook();	
 		}
 
 		protected override void OnClosed(EventArgs e)
@@ -85,7 +86,6 @@ protected override async void OnContentRendered(EventArgs e)
 
 			SceneManager.SceneChanged += SceneManager_SceneChanged;
 			SceneManager.CurrentSceneSelectionChanged += SceneManager_CurrentSceneSelectionChanged;
-			SceneManager.RequestWindowPreviewUpdate += SceneManager_RequestWindowPreviewUpdate;
 
 			AddInitialScenes();
 
@@ -129,23 +129,12 @@ private void SceneManager_CurrentSceneSelectionChanged(object? sender, CurrentSc
 			SyncVisibilityByUpdatedTimeStamp();
 		}
 
-		private void SceneManager_RequestWindowPreviewUpdate(object? sender, IWindow window)
-		{
-			var toUpdate = AllScenes
-				.Select(s => s?.Windows.FirstOrDefault(w => w.Handle == window.Handle))
-				.Where(w => w is object)
-				.FirstOrDefault();
-
-			toUpdate?.ForceUpdatePreview();
-		}
-
 		protected override void OnRenderSizeChanged(SizeChangedInfo sizeInfo)
 		{
 			base.OnRenderSizeChanged(sizeInfo);
 			var area = this.GetMonitorWorkSize();
 			this.Left = 0;
 			this.Top = 0;
-			//this.Width = area.Width / 15;
 			this.Height = area.Height;
 		}
 
diff --git a/StageManager/Model/WindowModel.cs b/StageManager/Model/WindowModel.cs
index 6b437a3..d986db6 100644
--- a/StageManager/Model/WindowModel.cs
+++ b/StageManager/Model/WindowModel.cs
@@ -20,7 +20,6 @@ public class WindowModel : INotifyPropertyChanged
 
 		private IWindow _window;
 		private ImageSource _iconSource;
-		private ImageSource _image;
 
 		public event PropertyChangedEventHandler PropertyChanged;
 
@@ -36,16 +35,6 @@ private void RaisePropertyChanged([System.Runtime.CompilerServices.CallerMemberN
 
 		public string Title => _window.Title.Length > 20 ? _window.Title.Substring(0, 17) + " ..." : _window.Title;
 
-		public ImageSource Image
-		{
-			get => _image;
-			set
-			{
-				_image = value;
-				RaisePropertyChanged();
-			}
-		}
-
 		public ImageSource ImageSourceFromBitmap(System.Drawing.Bitmap bmp)
 		{
 			if (bmp is null)
@@ -102,16 +91,9 @@ public IWindow Window
 				RaisePropertyChanged();
 				RaisePropertyChanged(nameof(Title));
 				RaisePropertyChanged(nameof(Handle));
-
-				ForceUpdatePreview();
 			}
 		}
 
-		internal void ForceUpdatePreview()
-		{
-			Image = ImageSourceFromBitmap(Screenshot.CaptureWindow(Handle));
-		}
-
 		public IntPtr Handle => _window?.Handle ?? IntPtr.Zero;
 	}
 }
diff --git a/StageManager/Native/Interop/DWMWINDOWATTRIBUTE.cs b/StageManager/Native/Interop/DWMWINDOWATTRIBUTE.cs
new file mode 100644
index 0000000..f857fc4
--- /dev/null
+++ b/StageManager/Native/Interop/DWMWINDOWATTRIBUTE.cs
@@ -0,0 +1,25 @@
+// ReSharper disable FieldCanBeMadeReadOnly.Global
+// ReSharper disable  InconsistentNaming
+// ReSharper disable MemberCanBePrivate.Global
+
+namespace StageManager.Native.Interop
+{
+    public enum DWMWINDOWATTRIBUTE
+    {
+        NCRenderingEnabled = 1,
+        NCRenderingPolicy,
+        TransitionsForceDisabled,
+        AllowNCPaint,
+        CaptionButtonBounds,
+        NonClientRtlLayout,
+        ForceIconicRepresentation,
+        Flip3DPolicy,
+        ExtendedFrameBounds,
+        HasIconicBitmap,
+        DisallowPeek,
+        ExcludedFromPeek,
+        Cloak,
+        Cloaked,
+        FreezeRepresentation
+    }
+}
\ No newline at end of file
diff --git a/StageManager/Native/Interop/DWM_THUMBNAIL_PROPERTIES.cs b/StageManager/Native/Interop/DWM_THUMBNAIL_PROPERTIES.cs
new file mode 100644
index 0000000..7df6983
--- /dev/null
+++ b/StageManager/Native/Interop/DWM_THUMBNAIL_PROPERTIES.cs
@@ -0,0 +1,22 @@
+using System.Runtime.InteropServices;
+
+// ReSharper disable FieldCanBeMadeReadOnly.Global
+// ReSharper disable  InconsistentNaming
+// ReSharper disable MemberCanBePrivate.Global
+
+namespace StageManager.Native.Interop
+{
+    [StructLayout(LayoutKind.Sequential)]
+    public struct DWM_THUMBNAIL_PROPERTIES
+    {
+        public int dwFlags;
+        public RECT rcDestination;
+        public RECT rcSource;
+        public byte opacity;
+
+        [MarshalAs(UnmanagedType.Bool, SizeConst = 4)]
+        public bool fVisible;
+
+        public bool fSourceClientAreaOnly;
+    }
+}
\ No newline at end of file
diff --git a/StageManager/Native/Interop/DWM_TNP.cs b/StageManager/Native/Interop/DWM_TNP.cs
new file mode 100644
index 0000000..c189616
--- /dev/null
+++ b/StageManager/Native/Interop/DWM_TNP.cs
@@ -0,0 +1,22 @@
+using System;
+
+// ReSharper disable FieldCanBeMadeReadOnly.Global
+// ReSharper disable  InconsistentNaming
+// ReSharper disable MemberCanBePrivate.Global
+
+namespace StageManager.Native.Interop
+{
+    [Flags]
+    public enum DWM_TNP
+    {
+        DWM_TNP_RECTDESTINATION = 0x00000001,
+
+        DWM_TNP_RECTSOURCE = 0x00000002,
+
+        DWM_TNP_OPACITY = 0x00000004,
+
+        DWM_TNP_VISIBLE = 0x00000008,
+
+        DWM_TNP_SOURCECLIENTAREAONLY = 0x00000010
+    }
+}
\ No newline at end of file
diff --git a/StageManager/Native/Interop/NativeMethods.cs b/StageManager/Native/Interop/NativeMethods.cs
new file mode 100644
index 0000000..b4f84aa
--- /dev/null
+++ b/StageManager/Native/Interop/NativeMethods.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+namespace StageManager.Native.Interop
+{
+    public static class NativeMethods
+    {
+        [DllImport("dwmapi.dll", SetLastError = true)]
+        public static extern int DwmRegisterThumbnail(IntPtr dest, IntPtr src, out IntPtr thumb);
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmUnregisterThumbnail(IntPtr thumb);
+
+        [DllImport("dwmapi.dll", PreserveSig = false)]
+        public static extern void DwmQueryThumbnailSourceSize(IntPtr hThumbnail, out Size size);
+
+        [DllImport("dwmapi.dll", PreserveSig = true)]
+        public static extern int DwmUpdateThumbnailProperties(IntPtr hThumbnail, ref DWM_THUMBNAIL_PROPERTIES props);
+
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmGetWindowAttribute(IntPtr hWnd, DWMWINDOWATTRIBUTE dwAttribute, out bool pvAttribute, int cbAttribute);
+    }
+}
\ No newline at end of file
diff --git a/StageManager/Native/Interop/RECT.cs b/StageManager/Native/Interop/RECT.cs
new file mode 100644
index 0000000..364a8ea
--- /dev/null
+++ b/StageManager/Native/Interop/RECT.cs
@@ -0,0 +1,22 @@
+using System.Runtime.InteropServices;
+
+// ReSharper disable FieldCanBeMadeReadOnly.Global
+// ReSharper disable  InconsistentNaming
+// ReSharper disable MemberCanBePrivate.Global
+
+namespace StageManager.Native.Interop
+{
+    [StructLayout(LayoutKind.Sequential)]
+    public struct RECT
+    {
+        public int left;
+        public int top;
+        public int right;
+        public int bottom;
+
+        public bool IsEmpty()
+        {
+            return left == 0 && top == 0 && right == 0 && bottom == 0;
+        }
+    }
+}
\ No newline at end of file
diff --git a/StageManager/Native/WindowsManager.cs b/StageManager/Native/WindowsManager.cs
index 81e3424..e78aea0 100644
--- a/StageManager/Native/WindowsManager.cs
+++ b/StageManager/Native/WindowsManager.cs
@@ -11,334 +11,387 @@
 
 namespace StageManager.Native
 {
-    public delegate void WindowDelegate(IWindow window);
-    public delegate void WindowCreateDelegate(IWindow window, bool firstCreate);
-    public delegate void WindowUpdateDelegate(IWindow window, WindowUpdateType type);
-
-    public class WindowsManager : IWindowsManager
-    {
-        private IDictionary<IntPtr, WindowsWindow> _windows;
-        private WinEventDelegate _hookDelegate;
-
-        private WindowsWindow _mouseMoveWindow;
-        private readonly object _mouseMoveLock = new object();
-        private Win32.HookProc _mouseHook;
-
-        private Dictionary<WindowsWindow, bool> _floating;
-        private IntPtr _currentProcessWindowHandle;
-        private int _currentProcessId;
-
-        /// <summary>
-        /// Notifies when a new window handle was created by the manager
-        /// </summary>
-        public event WindowCreateDelegate WindowCreated;
-        /// <summary>
-        /// Notifies when a handled window was removed by the manager
-        /// </summary>
-        public event WindowDelegate WindowDestroyed;
-        /// <summary>
-        /// Notifies when a handled window was updated by the manager
-        /// This is used internally by the workspace manager to apply the update to the window
-        /// </summary>
-        public event WindowUpdateDelegate WindowUpdated;
-
-        public event EventHandler<IntPtr> UntrackedFocus;
+	public delegate void WindowDelegate(IWindow window);
+	public delegate void WindowCreateDelegate(IWindow window, bool firstCreate);
+	public delegate void WindowUpdateDelegate(IWindow window, WindowUpdateType type);
+
+	public class WindowsManager : IWindowsManager
+	{
+		private bool _active;
+		private IDictionary<IntPtr, WindowsWindow> _windows;
+		private WinEventDelegate _hookDelegate;
+
+		private WindowsWindow _mouseMoveWindow;
+		private readonly object _mouseMoveLock = new object();
+		private Win32.HookProc _mouseHook;
+
+		private Dictionary<WindowsWindow, bool> _floating;
+		private IntPtr _currentProcessWindowHandle;
+		private int _currentProcessId;
+
+		/// <summary>
+		/// Notifies when a new window handle was created by the manager
+		/// </summary>
+		public event WindowCreateDelegate WindowCreated;
+		/// <summary>
+		/// Notifies when a handled window was removed by the manager
+		/// </summary>
+		public event WindowDelegate WindowDestroyed;
+		/// <summary>
+		/// Notifies when a handled window was updated by the manager
+		/// This is used internally by the workspace manager to apply the update to the window
+		/// </summary>
+		public event WindowUpdateDelegate WindowUpdated;
+
+		public event EventHandler<IntPtr> UntrackedFocus;
 
 		/// <summary>
 		/// Notifies when a window focuses itself
 		/// </summary>
 		public event WindowFocusDelegate WindowFocused;
 
-        public event EventHandler WindowMoved;
-
-        /// <summary>
-        /// Notifies when a window updated itself
-        /// This is used to externally notify when an update was applied to a window
-        /// </summary>
-        public event WindowDelegate ExternalWindowUpdate;
-        /// <summary>
-        /// Notifies when a window closes itself
-        /// This is used to externally notify when a window was closed
-        /// </summary>
-        public event WindowDelegate ExternalWindowClosed;
-
-        public IEnumerable<IWindow> Windows => _windows.Values;
-
-        public WindowsManager()
-        {
-            _windows = new Dictionary<IntPtr, WindowsWindow>();
-            _floating = new Dictionary<WindowsWindow, bool>();
-            _hookDelegate = new WinEventDelegate(WindowHook);
-        }
-
-        public Task Start()
-        {
-            var currentProcess = Process.GetCurrentProcess();
-            _currentProcessId = currentProcess.Id;
-            _currentProcessWindowHandle = currentProcess.MainWindowHandle;
+		public event EventHandler WindowMoved;
+
+		/// <summary>
+		/// Notifies when a window updated itself
+		/// This is used to externally notify when an update was applied to a window
+		/// </summary>
+		public event WindowDelegate ExternalWindowUpdate;
+		/// <summary>
+		/// Notifies when a window closes itself
+		/// This is used to externally notify when a window was closed
+		/// </summary>
+		public event WindowDelegate ExternalWindowClosed;
+
+		public IEnumerable<IWindow> Windows => _windows.Values;
+
+		public WindowsManager()
+		{
+			_windows = new Dictionary<IntPtr, WindowsWindow>();
+			_floating = new Dictionary<WindowsWindow, bool>();
+			_hookDelegate = new WinEventDelegate(WindowHook);
+		}
+
+		public Task Start()
+		{
+			_active = true;
+
+			var currentProcess = Process.GetCurrentProcess();
+			_currentProcessId = currentProcess.Id;
+			_currentProcessWindowHandle = currentProcess.MainWindowHandle;
 
 			Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_OBJECT_DESTROY, Win32.EVENT_CONSTANTS.EVENT_OBJECT_SHOW, IntPtr.Zero, _hookDelegate, 0, 0, 0);
-            Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_OBJECT_CLOAKED, Win32.EVENT_CONSTANTS.EVENT_OBJECT_UNCLOAKED, IntPtr.Zero, _hookDelegate, 0, 0, 0);
-            Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MINIMIZESTART, Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MINIMIZEEND, IntPtr.Zero, _hookDelegate, 0, 0, 0);
-            Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MOVESIZESTART, Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MOVESIZEEND, IntPtr.Zero, _hookDelegate, 0, 0, 0);
-            Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_SYSTEM_FOREGROUND, Win32.EVENT_CONSTANTS.EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, _hookDelegate, 0, 0, 0);
-            Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_OBJECT_LOCATIONCHANGE, Win32.EVENT_CONSTANTS.EVENT_OBJECT_LOCATIONCHANGE, IntPtr.Zero, _hookDelegate, 0, 0, 0);
-
-            _mouseHook = MouseHook;
-
-            Win32.EnumWindows((handle, param) =>
-            {
-                if (Win32Helper.IsAppWindow(handle))
-                {
-                    RegisterWindow(handle, false);
-                }
-                return true;
-            }, IntPtr.Zero);
-
-            var thread = new Thread(() =>
-            {
-                Win32.SetWindowsHookEx(Win32.WH_MOUSE_LL, _mouseHook, currentProcess.MainModule.BaseAddress, 0);
-                Application.Run();
-            });
-            thread.Name = "WindowsManager";
-            thread.Start();
-
-            return Task.CompletedTask;
-        }
-
-        public IWindowsDeferPosHandle DeferWindowsPos(int count)
-        {
-            var info = Win32.BeginDeferWindowPos(count);
-            return new WindowsDeferPosHandle(info);
-        }
-        
-        public void ToggleFocusedWindowTiling()
-        {
-            var window = _windows.Values.FirstOrDefault(w => w.IsFocused);
-
-            if (window != null)
-            {
-                if (_floating.ContainsKey(window))
-                {
-                    _floating.Remove(window);
-                    HandleWindowAdd(window, false);
-                }
-                else
-                {
-                    _floating[window] = true;
-                    HandleWindowRemove(window);
-                    window.BringToTop();
-                }
-                window.Focus();
-            }
-        }
-
-        private IntPtr MouseHook(int nCode, UIntPtr wParam, IntPtr lParam)
-        {
-            if (nCode == 0 && (uint)wParam == Win32.WM_LBUTTONUP)
-                HandleWindowMoveEnd();
-            
-            return Win32.CallNextHookEx(IntPtr.Zero, nCode, wParam, lParam);
-        }
-
-        private void WindowHook(IntPtr hWinEventHook, Win32.EVENT_CONSTANTS eventType, IntPtr hwnd, Win32.OBJID idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
-        {
-            if (EventWindowIsValid(idChild, idObject, hwnd))
-            {
-                switch (eventType)
-                {
-                    case Win32.EVENT_CONSTANTS.EVENT_OBJECT_SHOW:
-                        RegisterWindow(hwnd);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_OBJECT_DESTROY:
-                        UnregisterWindow(hwnd);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_OBJECT_CLOAKED:
-                        UpdateWindow(hwnd, WindowUpdateType.Hide);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_OBJECT_UNCLOAKED:
-                        UpdateWindow(hwnd, WindowUpdateType.Show);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MINIMIZESTART:
-                        UpdateWindow(hwnd, WindowUpdateType.MinimizeStart);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MINIMIZEEND:
-                        UpdateWindow(hwnd, WindowUpdateType.MinimizeEnd);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_FOREGROUND:
-                        UpdateWindow(hwnd, WindowUpdateType.Foreground);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MOVESIZESTART:
-                        StartWindowMove(hwnd);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MOVESIZEEND:
-                        EndWindowMove(hwnd);
-                        break;
-                    case Win32.EVENT_CONSTANTS.EVENT_OBJECT_LOCATIONCHANGE:
-                        WindowMove(hwnd);
-                        break;
-                }
-            }
-        }
-
-        private bool EventWindowIsValid(int idChild, Win32.OBJID idObject, IntPtr hwnd)
-        {
-            return idChild == Win32.CHILDID_SELF && idObject == Win32.OBJID.OBJID_WINDOW && hwnd != IntPtr.Zero;
-        }
-
-        private void RegisterWindow(IntPtr handle, bool emitEvent = true)
-        {
-            if (handle == _currentProcessWindowHandle)
-                return;
-
-            if (!_windows.ContainsKey(handle))
-            {
-                var window = new WindowsWindow(handle);
-
-                if (window.ProcessId < 0 || window.ProcessId == _currentProcessId)
-                    return;
-
-                if (window.IsCandidate())
-                {
-                    window.WindowFocused += (sender) => HandleWindowFocused(sender);
-                    window.WindowUpdated += (sender) => HandleWindowUpdated(sender);
-                    window.WindowClosed += (sender) => HandleWindowClosed(sender);
-
-                    _windows[handle] = window;
-
-                    if (emitEvent)
-                    {
-                        HandleWindowAdd(window, true);
-                    }
-                }
-            }
-        }
-
-        private void UnregisterWindow(IntPtr handle)
-        {
-            if (_windows.ContainsKey(handle))
-            {
-                var window = _windows[handle];
-                _windows.Remove(handle);
-                HandleWindowRemove(window);
-            }
-        }
-
-        private void UpdateWindow(IntPtr handle, WindowUpdateType type)
-        {
-            if (type == WindowUpdateType.Show  && _windows.ContainsKey(handle))
-            {
-                var window = _windows[handle];
-                WindowUpdated?.Invoke(window, type);
-            }
-            else if (type == WindowUpdateType.Show)
-            {
-                RegisterWindow(handle);
-            }
-            else if (type == WindowUpdateType.Hide && _windows.ContainsKey(handle))
-            {
-                var window = _windows[handle];
-                if (!window.DidManualHide)
-                {
-                    UnregisterWindow(handle);
-                } else
-                {
-                    WindowUpdated?.Invoke(window, type);
-                }
-            }
-            else if (_windows.ContainsKey(handle))
-            {
-                var window = _windows[handle];
-                WindowUpdated?.Invoke(window, type);
-            }
-            else
-            {
-                UntrackedFocus?.Invoke(this, handle);
-            }
-        }
-
-        private void StartWindowMove(IntPtr handle)
-        {
-            if (_windows.ContainsKey(handle))
-            {
-                var window = _windows[handle];
-                window.StoreLastLocation();
-
-                HandleWindowMoveStart(window);
-                WindowUpdated?.Invoke(window, WindowUpdateType.MoveStart);
-            }
-        }
-
-        private void EndWindowMove(IntPtr handle)
-        {
-            if (_windows.ContainsKey(handle))
-            {
-                var window = _windows[handle];
-
-                HandleWindowMoveEnd();
-                WindowUpdated?.Invoke(window, WindowUpdateType.MoveEnd);
-            }
-        }
-
-        private void WindowMove(IntPtr handle)
-        {
-            if (_mouseMoveWindow != null && _windows.ContainsKey(handle))
-            {
-                var window = _windows[handle];
-                if (_mouseMoveWindow == window)
-                    WindowUpdated?.Invoke(window, WindowUpdateType.Move);
-            }
-        }
-
-        private void HandleWindowFocused(IWindow window)
-        {
-            WindowFocused?.Invoke(window);
-        }
-
-        private void HandleWindowUpdated(IWindow window)
-        {
-            ExternalWindowUpdate?.Invoke(window);
-        }
-
-        private void HandleWindowClosed(IWindow window)
-        {
-            ExternalWindowClosed?.Invoke(window);
-        }
-
-        private void HandleWindowMoveStart(WindowsWindow window)
-        {
-            if (_mouseMoveWindow != null)
-            {
-                _mouseMoveWindow.IsMouseMoving = false;
-            }
-
-            _mouseMoveWindow = window;
-            window.IsMouseMoving = true;
-        }
-
-        private void HandleWindowMoveEnd()
-        {
-            lock (_mouseMoveLock)
-            {
-                if (_mouseMoveWindow != null)
-                {
-                    var window = _mouseMoveWindow;
+			Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_OBJECT_CLOAKED, Win32.EVENT_CONSTANTS.EVENT_OBJECT_UNCLOAKED, IntPtr.Zero, _hookDelegate, 0, 0, 0);
+			Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MINIMIZESTART, Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MINIMIZEEND, IntPtr.Zero, _hookDelegate, 0, 0, 0);
+			Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MOVESIZESTART, Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MOVESIZEEND, IntPtr.Zero, _hookDelegate, 0, 0, 0);
+			Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_SYSTEM_FOREGROUND, Win32.EVENT_CONSTANTS.EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, _hookDelegate, 0, 0, 0);
+			Win32.SetWinEventHook(Win32.EVENT_CONSTANTS.EVENT_OBJECT_LOCATIONCHANGE, Win32.EVENT_CONSTANTS.EVENT_OBJECT_LOCATIONCHANGE, IntPtr.Zero, _hookDelegate, 0, 0, 0);
+
+			_mouseHook = MouseHook;
+
+			Win32.EnumWindows((handle, param) =>
+			{
+				if (Win32Helper.IsAppWindow(handle))
+				{
+					RegisterWindow(handle, false);
+				}
+				return true;
+			}, IntPtr.Zero);
+
+			var thread = new Thread(() =>
+			{
+				Win32.SetWindowsHookEx(Win32.WH_MOUSE_LL, _mouseHook, currentProcess.MainModule.BaseAddress, 0);
+				Application.Run();
+			});
+
+			thread.Name = "WindowsManager";
+			thread.Start();
+
+			return Task.CompletedTask;
+		}
+
+		public void Stop()
+		{
+			_active = false;
+		}
+
+		public IWindowsDeferPosHandle DeferWindowsPos(int count)
+		{
+			var info = Win32.BeginDeferWindowPos(count);
+			return new WindowsDeferPosHandle(info);
+		}
+
+		public void ToggleFocusedWindowTiling()
+		{
+			if (!_active)
+				return;
+
+			var window = _windows.Values.FirstOrDefault(w => w.IsFocused);
+
+			if (window != null)
+			{
+				if (_floating.ContainsKey(window))
+				{
+					_floating.Remove(window);
+					HandleWindowAdd(window, false);
+				}
+				else
+				{
+					_floating[window] = true;
+					HandleWindowRemove(window);
+					window.BringToTop();
+				}
+				window.Focus();
+			}
+		}
+
+		private IntPtr MouseHook(int nCode, UIntPtr wParam, IntPtr lParam)
+		{
+			if (nCode == 0 && (uint)wParam == Win32.WM_LBUTTONUP)
+				HandleWindowMoveEnd();
+
+			return Win32.CallNextHookEx(IntPtr.Zero, nCode, wParam, lParam);
+		}
+
+		private void WindowHook(IntPtr hWinEventHook, Win32.EVENT_CONSTANTS eventType, IntPtr hwnd, Win32.OBJID idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
+		{
+			if (!_active)
+				return;
+
+			if (EventWindowIsValid(idChild, idObject, hwnd))
+			{
+				switch (eventType)
+				{
+					case Win32.EVENT_CONSTANTS.EVENT_OBJECT_SHOW:
+						RegisterWindow(hwnd);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_OBJECT_DESTROY:
+						UnregisterWindow(hwnd);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_OBJECT_CLOAKED:
+						UpdateWindow(hwnd, WindowUpdateType.Hide);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_OBJECT_UNCLOAKED:
+						UpdateWindow(hwnd, WindowUpdateType.Show);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MINIMIZESTART:
+						UpdateWindow(hwnd, WindowUpdateType.MinimizeStart);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MINIMIZEEND:
+						UpdateWindow(hwnd, WindowUpdateType.MinimizeEnd);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_FOREGROUND:
+						UpdateWindow(hwnd, WindowUpdateType.Foreground);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MOVESIZESTART:
+						StartWindowMove(hwnd);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_SYSTEM_MOVESIZEEND:
+						EndWindowMove(hwnd);
+						break;
+					case Win32.EVENT_CONSTANTS.EVENT_OBJECT_LOCATIONCHANGE:
+						WindowMove(hwnd);
+						break;
+				}
+			}
+		}
+
+		private bool EventWindowIsValid(int idChild, Win32.OBJID idObject, IntPtr hwnd)
+		{
+			return idChild == Win32.CHILDID_SELF && idObject == Win32.OBJID.OBJID_WINDOW && hwnd != IntPtr.Zero;
+		}
+
+		private void RegisterWindow(IntPtr handle, bool emitEvent = true)
+		{
+			if (!_active)
+				return;
+
+			if (handle == _currentProcessWindowHandle)
+				return;
+
+			if (!_windows.ContainsKey(handle))
+			{
+				var window = new WindowsWindow(handle);
+
+				if (window.ProcessId < 0 || window.ProcessId == _currentProcessId)
+					return;
+
+				if (window.IsCandidate())
+				{
+					window.WindowFocused += (sender) => HandleWindowFocused(sender);
+					window.WindowUpdated += (sender) => HandleWindowUpdated(sender);
+					window.WindowClosed += (sender) => HandleWindowClosed(sender);
+
+					_windows[handle] = window;
+
+					if (emitEvent)
+					{
+						HandleWindowAdd(window, true);
+					}
+				}
+			}
+		}
+
+		private void UnregisterWindow(IntPtr handle)
+		{
+			if (!_active)
+				return;
+
+			if (_windows.ContainsKey(handle))
+			{
+				var window = _windows[handle];
+				_windows.Remove(handle);
+				HandleWindowRemove(window);
+			}
+		}
+
+		private void UpdateWindow(IntPtr handle, WindowUpdateType type)
+		{
+			if (!_active)
+				return;
+
+			if (type == WindowUpdateType.Show && _windows.ContainsKey(handle))
+			{
+				var window = _windows[handle];
+				WindowUpdated?.Invoke(window, type);
+			}
+			else if (type == WindowUpdateType.Show)
+			{
+				RegisterWindow(handle);
+			}
+			else if (type == WindowUpdateType.Hide && _windows.ContainsKey(handle))
+			{
+				var window = _windows[handle];
+				if (!window.DidManualHide)
+				{
+					UnregisterWindow(handle);
+				}
+				else
+				{
+					WindowUpdated?.Invoke(window, type);
+				}
+			}
+			else if (_windows.ContainsKey(handle))
+			{
+				var window = _windows[handle];
+				WindowUpdated?.Invoke(window, type);
+			}
+			else
+			{
+				UntrackedFocus?.Invoke(this, handle);
+			}
+		}
+
+		private void StartWindowMove(IntPtr handle)
+		{
+			if (!_active)
+				return;
+
+			if (_windows.ContainsKey(handle))
+			{
+				var window = _windows[handle];
+				window.StoreLastLocation();
+
+				HandleWindowMoveStart(window);
+				WindowUpdated?.Invoke(window, WindowUpdateType.MoveStart);
+			}
+		}
+
+		private void EndWindowMove(IntPtr handle)
+		{
+			if (!_active)
+				return;
+
+			if (_windows.ContainsKey(handle))
+			{
+				var window = _windows[handle];
+
+				HandleWindowMoveEnd();
+				WindowUpdated?.Invoke(window, WindowUpdateType.MoveEnd);
+			}
+		}
+
+		private void WindowMove(IntPtr handle)
+		{
+			if (!_active)
+				return;
+
+			if (_mouseMoveWindow != null && _windows.ContainsKey(handle))
+			{
+				var window = _windows[handle];
+				if (_mouseMoveWindow == window)
+					WindowUpdated?.Invoke(window, WindowUpdateType.Move);
+			}
+		}
+
+		private void HandleWindowFocused(IWindow window)
+		{
+			if (!_active)
+				return;
+
+			WindowFocused?.Invoke(window);
+		}
+
+		private void HandleWindowUpdated(IWindow window)
+		{
+			if (!_active)
+				return;
+
+			ExternalWindowUpdate?.Invoke(window);
+		}
+
+		private void HandleWindowClosed(IWindow window)
+		{
+			if (!_active)
+				return;
+
+			ExternalWindowClosed?.Invoke(window);
+		}
+
+		private void HandleWindowMoveStart(WindowsWindow window)
+		{
+			if (!_active)
+				return;
+
+			if (_mouseMoveWindow != null)
+				_mouseMoveWindow.IsMouseMoving = false;
+
+			_mouseMoveWindow = window;
+			window.IsMouseMoving = true;
+		}
+
+		private void HandleWindowMoveEnd()
+		{
+			if (!_active)
+				return;
+
+			lock (_mouseMoveLock)
+			{
+				if (_mouseMoveWindow != null)
+				{
+					var window = _mouseMoveWindow;
 					_mouseMoveWindow = null;
 
 					window.IsMouseMoving = false;
-                    WindowMoved?.Invoke(window, EventArgs.Empty);
-                }
-            }
-        }
-
-        private void HandleWindowAdd(IWindow window, bool firstCreate)
-        {
-            WindowCreated?.Invoke(window, firstCreate);
-        }
-
-        private void HandleWindowRemove(IWindow window)
-        {
-            WindowDestroyed?.Invoke(window);
-        }
-    }
+					WindowMoved?.Invoke(window, EventArgs.Empty);
+				}
+			}
+		}
+
+		private void HandleWindowAdd(IWindow window, bool firstCreate)
+		{
+			if (!_active)
+				return;
+
+			WindowCreated?.Invoke(window, firstCreate);
+		}
+
+		private void HandleWindowRemove(IWindow window)
+		{
+			if (!_active)
+				return;
+
+			WindowDestroyed?.Invoke(window);
+		}
+	}
 }
diff --git a/StageManager/Native/WindowsWindow.cs b/StageManager/Native/WindowsWindow.cs
index 9585ae6..a0acf46 100644
--- a/StageManager/Native/WindowsWindow.cs
+++ b/StageManager/Native/WindowsWindow.cs
@@ -5,13 +5,12 @@
 using System.Diagnostics;
 using System.Drawing;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 
 namespace StageManager.Native
 {
-    public class WindowsWindow : IWindow
+	public class WindowsWindow : IWindow
 	{
 		private IntPtr _handle;
 		private bool _didManualHide;
@@ -32,12 +31,8 @@ public WindowsWindow(IntPtr handle)
 
 			try
 			{
-				uint processId;
-				Win32.GetWindowThreadProcessId(_handle, out processId);
-
-				_processId = (int)processId;
-
-				var process = Process.GetProcesses().FirstOrDefault(p => p.Id == _processId);
+				var process = GetProcessByWindowHandle(_handle);
+				_processId = process.Id;
 				_processName = process.ProcessName;
 				_processExecutable = process.MainModule.FileName;
 
@@ -58,6 +53,23 @@ public WindowsWindow(IntPtr handle)
 			}
 		}
 
+		private Process GetProcessByWindowHandle(IntPtr windowHandle)
+		{
+			Win32.GetWindowThreadProcessId(windowHandle, out var processId);
+
+			var result = (int)processId;
+
+			var process = Process.GetProcessById(result);
+
+			// handling for UWP apps
+			if (process.ProcessName.Contains("ApplicationFrameHost"))
+			{
+				// TODO
+			}
+
+			return process;
+		}
+
 		public bool DidManualHide => _didManualHide;
 
 		public string Title
@@ -157,7 +169,7 @@ public bool CanLayout
 			get
 			{
 				return _didManualHide ||
-					(!Win32Helper.IsCloaked(_handle) &&
+					(!Win32Helper.IsCloaked(_handle) /* https://devblogs.microsoft.com/oldnewthing/20200302-00/?p=103507 */ &&
 					   Win32Helper.IsAppWindow(_handle) &&
 					   Win32Helper.IsAltTabWindow(_handle));
 			}
@@ -294,4 +306,4 @@ public Icon ExtractIcon()
 
 
 	}
-}
+}
\ No newline at end of file
diff --git a/StageManager/SceneManager.cs b/StageManager/SceneManager.cs
index 7fb4524..ad4e4d6 100644
--- a/StageManager/SceneManager.cs
+++ b/StageManager/SceneManager.cs
@@ -11,7 +11,7 @@
 
 namespace StageManager
 {
-    public class SceneManager
+	public class SceneManager
 	{
 		private readonly Desktop _desktop;
 		private List<Scene> _scenes;
@@ -21,10 +21,8 @@ public class SceneManager
 
 		public event EventHandler<SceneChangedEventArgs> SceneChanged;
 		public event EventHandler<CurrentSceneSelectionChangedEventArgs> CurrentSceneSelectionChanged;
-		public event EventHandler<IWindow> RequestWindowPreviewUpdate;
 
-		private IWindowStrategy ShowStrategy { get; } = new WindowNormalizeStrategy();
-		private IWindowStrategy HideStrategy { get; } = new WindowMinimizeStrategy();
+		private IWindowStrategy WindowStrategy { get; } = new NormalizeAndMinimizeWindowStrategy(); // new WindowNormalizeStrategy/OpacityWindowStrategy/ShowAndHideWindowStrategy
 
 		public WindowsManager WindowsManager { get; }
 
@@ -50,6 +48,14 @@ public async Task Start()
 
 		internal void Stop()
 		{
+			WindowsManager.Stop();
+
+			foreach (var scene in _scenes)
+			{
+				foreach (var w in scene.Windows)
+					WindowStrategy.Show(w);
+			}
+
 			_desktop.ShowIcons();
 		}
 
@@ -105,13 +111,12 @@ private async void WindowsManager_WindowCreated(IWindow window, bool firstCreate
 			SwitchToSceneByNewWindow(window).SafeFireAndForget();
 		}
 
-
 		private async Task SwitchToSceneByWindow(IWindow window)
 		{
 			var scene = FindSceneForWindow(window);
 			if (scene is null)
 			{
-				scene = new Scene(window.ProcessName, window);
+				scene = new Scene(GetWindowGroupKey(window), window);
 				_scenes.Add(scene);
 				SceneChanged?.Invoke(this, new SceneChangedEventArgs(scene, window, ChangeType.Created));
 			}
@@ -121,7 +126,7 @@ private async Task SwitchToSceneByWindow(IWindow window)
 
 		private async Task SwitchToSceneByNewWindow(IWindow window)
 		{
-			var existentScene = FindSceneForProcess(window.ProcessName);
+			var existentScene = FindSceneForProcess(GetWindowGroupKey(window));
 			var scene = existentScene ?? new Scene(window.ProcessName, window);
 
 			if (existentScene is null)
@@ -184,24 +189,17 @@ public async Task SwitchTo(Scene? scene)
 				var prior = _current;
 				_current = scene;
 
-				if (prior is object)
-				{
-					// screenshot the windows before hiding them
-					foreach (var w in prior.Windows)
-						RequestWindowPreviewUpdate?.Invoke(this, w);
-				}
-
 				foreach (var s in _scenes)
 					s.IsSelected = s.Equals(scene);
 
 				if (scene is object)
 				{
 					foreach (var w in scene.Windows)
-						ShowStrategy.Invoke(w);
+						WindowStrategy.Show(w);
 				}
 
 				foreach (var o in otherWindows)
-					HideStrategy.Invoke(o);
+					WindowStrategy.Hide(o);
 
 				CurrentSceneSelectionChanged?.Invoke(this, new CurrentSceneSelectionChangedEventArgs(prior, _current));
 
@@ -239,12 +237,12 @@ public Task MoveWindow(Scene sourceScene, IWindow window, Scene targetScene)
 
 				if (targetScene.Equals(_current))
 				{
-					ShowStrategy.Invoke(window);
+					WindowStrategy.Show(window);
 					window.Focus();
 				}
 				else
 				{
-					HideStrategy.Invoke(window);
+					WindowStrategy.Hide(window);
 
 					// reset window position after move so that the window is back at the starting position on the new scene
 					if (window is WindowsWindow w && w.PopLastLocation() is IWindowLocation l)
@@ -288,7 +286,7 @@ public IEnumerable<Scene> GetScenes()
 			if (_scenes is null)
 			{
 				_scenes = GetSceneableWindows()
-							.GroupBy(w => w.ProcessName)
+							.GroupBy(GetWindowGroupKey)
 							.Select(group => new Scene(group.Key, group.ToArray()))
 							.ToList();
 			}
@@ -297,5 +295,7 @@ public IEnumerable<Scene> GetScenes()
 		}
 
 		public IEnumerable<IWindow> GetCurrentWindows() => _current?.Windows ?? GetSceneableWindows();
+
+		private string GetWindowGroupKey(IWindow window) => window.ProcessName;
 	}
 }
diff --git a/StageManager/Screenshot.cs b/StageManager/Screenshot.cs
deleted file mode 100644
index b435b73..0000000
--- a/StageManager/Screenshot.cs
+++ /dev/null
@@ -1,512 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace StageManager
-{
-	internal class Screenshot
-	{
-		[DllImport("user32.dll", SetLastError = true)]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		static extern bool PrintWindow(IntPtr hwnd, IntPtr hDC, uint nFlags);
-
-		const int PW_RENDERFULLCONTENT = 2;
-
-		[DllImport("user32.dll")]
-		public static extern IntPtr GetWindowDC(IntPtr hWnd);
-
-		[DllImport("gdi32.dll")]
-		public static extern IntPtr CreateCompatibleDC(IntPtr hdc);
-
-		[DllImport("gdi32.dll")]
-		public static extern IntPtr CreateCompatibleBitmap(IntPtr hdc, int nWidth, int nHeight);
-
-		[DllImport("gdi32.dll")]
-		public static extern IntPtr SelectObject(IntPtr hdc, IntPtr hgdiobj);
-
-		[DllImport("gdi32.dll")]
-		public static extern bool BitBlt(IntPtr hdc, int nXDest, int nYDest, int nWidth, int nHeight, IntPtr hdcSrc, int nXSrc, int nYSrc, CopyPixelOperation dwRop);
-
-
-		[DllImport("gdi32.dll")]
-		public static extern bool DeleteDC(IntPtr hDC);
-
-
-		[DllImport("user32.dll")]
-		public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
-
-		[DllImport("gdi32.dll")]
-		public static extern bool DeleteObject(IntPtr hObject);
-
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		private static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
-
-		[DllImport("dwmapi.dll", PreserveSig = false)]
-		public static extern bool DwmIsCompositionEnabled();
-
-
-		[DllImport("dwmapi.dll")]
-		private static extern int DwmGetWindowAttribute(IntPtr hwnd, int dwAttribute, out RECT pvAttribute, int cbAttribute);
-
-		/// <summary>Determines whether a window is maximized.</summary>
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		public static extern bool IsZoomed(IntPtr hWnd);
-
-		[DllImport("user32.dll")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		private static extern bool GetWindowInfo(IntPtr hwnd, ref WINDOWINFO pwi);
-
-		public static Rectangle GetWindowRect(IntPtr handle)
-		{
-			GetWindowRect(handle, out RECT rect);
-			return rect;
-		}
-
-		public static bool IsDWMEnabled()
-		{
-			return IsWindowsVistaOrGreater() && DwmIsCompositionEnabled();
-		}
-
-		public static bool IsWindowsVistaOrGreater()
-		{
-			return Environment.OSVersion.Version.Major >= 6;
-		}
-
-		public static bool IsWindows10OrGreater(int build = -1)
-		{
-			return Environment.OSVersion.Version.Major >= 10 && Environment.OSVersion.Version.Build >= build;
-		}
-
-		public static bool GetExtendedFrameBounds(IntPtr handle, out Rectangle rectangle)
-		{
-			int result = DwmGetWindowAttribute(handle, (int)DwmWindowAttribute.DWMWA_EXTENDED_FRAME_BOUNDS, out RECT rect, Marshal.SizeOf(typeof(RECT)));
-			rectangle = rect;
-			return result == 0;
-		}
-
-		public static bool GetBorderSize(IntPtr handle, out Size size)
-		{
-			WINDOWINFO wi = WINDOWINFO.Create();
-			bool result = GetWindowInfo(handle, ref wi);
-
-			if (result)
-			{
-				size = new Size((int)wi.cxWindowBorders, (int)wi.cyWindowBorders);
-			}
-			else
-			{
-				size = Size.Empty;
-			}
-
-			return result;
-		}
-
-		public static Rectangle MaximizedWindowFix(IntPtr handle, Rectangle windowRect)
-		{
-			if (GetBorderSize(handle, out Size size))
-			{
-				windowRect = new Rectangle(windowRect.X + size.Width, windowRect.Y + size.Height, windowRect.Width - (size.Width * 2), windowRect.Height - (size.Height * 2));
-			}
-
-			return windowRect;
-		}
-
-		public static Rectangle GetWindowRectangle(IntPtr handle)
-		{
-			Rectangle rect = Rectangle.Empty;
-
-			if (IsDWMEnabled() && GetExtendedFrameBounds(handle, out Rectangle tempRect))
-			{
-				rect = tempRect;
-			}
-
-			if (rect.IsEmpty)
-			{
-				rect = GetWindowRect(handle);
-			}
-
-			if (!IsWindows10OrGreater() && IsZoomed(handle))
-			{
-				rect = MaximizedWindowFix(handle, rect);
-			}
-
-			return rect;
-		}
-
-		//public static Bitmap CaptureWindowRelativeToDesktop(IntPtr handle)
-		//{
-		//	Rectangle rect = GetWindowRectangle(handle);
-
-		//	if (rect.IsEmpty)
-		//		return null;
-
-		//	var screenBounds = Screen.FromHandle(handle).WorkingArea.Size;
-		//	var screenBmp = new Bitmap(screenBounds.Width, screenBounds.Height);
-
-		//	// Create a bitmap of the appropriate size to receive the screenshot.
-		//	var windowBmp = new Bitmap(rect.Width, rect.Height);
-
-		//	// Draw the screenshot into our bitmap.
-		//	using (var g = Graphics.FromImage(windowBmp))
-		//	{
-		//		IntPtr dc = g.GetHdc();
-
-		//		// Grab a copy of the window. Use PrintWindow because it works even when the
-		//		// window's partially occluded. The PW_RENDERFULLCONTENT flag is undocumented,
-		//		// but works starting in Windows 8.1. It allows for capturing the contents of
-		//		// the window that are drawn using DirectComposition.
-		//		bool success = PrintWindow(handle, dc, PW_RENDERFULLCONTENT);
-		//		g.ReleaseHdc(dc);
-		//	}
-
-		//	using (var g = Graphics.FromImage(screenBmp))
-		//	{
-		//		g.DrawImageUnscaled(windowBmp, rect.Location);
-		//	}
-
-		//	//using (var stream = new MemoryStream())
-		//	//{
-		//	//	bmp.Save(stream, ImageFormat.Png);
-		//	//	return (Bitmap)Bitmap.FromStream(stream);
-		//	//}
-		//	return screenBmp;
-		//}
-
-		public static Bitmap CaptureWindow(IntPtr handle)
-		{
-			var sw = Stopwatch.StartNew();
-
-			try
-			{
-				Rectangle rect = GetWindowRectangle(handle);
-
-				if (rect.IsEmpty)
-					return null;
-
-				// Create a bitmap of the appropriate size to receive the screenshot.
-				using (Bitmap bmp = new Bitmap(rect.Width, rect.Height))
-				{
-					// Draw the screenshot into our bitmap.
-					using (Graphics g = Graphics.FromImage(bmp))
-					{
-						IntPtr dc = g.GetHdc();
-
-						// Grab a copy of the window. Use PrintWindow because it works even when the
-						// window's partially occluded. The PW_RENDERFULLCONTENT flag is undocumented,
-						// but works starting in Windows 8.1. It allows for capturing the contents of
-						// the window that are drawn using DirectComposition.
-						bool success = PrintWindow(handle, dc, PW_RENDERFULLCONTENT);
-						g.ReleaseHdc(dc);
-					}
-
-					using (var stream = new MemoryStream())
-					{
-						bmp.Save(stream, ImageFormat.Jpeg);
-						return (Bitmap)Bitmap.FromStream(stream);
-					}
-				}
-			}
-			finally
-			{
-				sw.Stop();
-			}
-		}
-
-
-		[StructLayout(LayoutKind.Sequential)]
-		protected struct RECT
-		{
-			public int Left;
-			public int Top;
-			public int Right;
-			public int Bottom;
-
-			public int X
-			{
-				get
-				{
-					return Left;
-				}
-				set
-				{
-					Right -= Left - value;
-					Left = value;
-				}
-			}
-
-			public int Y
-			{
-				get
-				{
-					return Top;
-				}
-				set
-				{
-					Bottom -= Top - value;
-					Top = value;
-				}
-			}
-
-			public int Width
-			{
-				get
-				{
-					return Right - Left;
-				}
-				set
-				{
-					Right = value + Left;
-				}
-			}
-
-			public int Height
-			{
-				get
-				{
-					return Bottom - Top;
-				}
-				set
-				{
-					Bottom = value + Top;
-				}
-			}
-
-			public Point Location
-			{
-				get
-				{
-					return new Point(Left, Top);
-				}
-				set
-				{
-					X = value.X;
-					Y = value.Y;
-				}
-			}
-
-			public Size Size
-			{
-				get
-				{
-					return new Size(Width, Height);
-				}
-				set
-				{
-					Width = value.Width;
-					Height = value.Height;
-				}
-			}
-
-			public RECT(int left, int top, int right, int bottom)
-			{
-				Left = left;
-				Top = top;
-				Right = right;
-				Bottom = bottom;
-			}
-
-			public RECT(Rectangle r) : this(r.Left, r.Top, r.Right, r.Bottom)
-			{
-			}
-
-			public static implicit operator Rectangle(RECT r)
-			{
-				return new Rectangle(r.Left, r.Top, r.Width, r.Height);
-			}
-
-			public static implicit operator RECT(Rectangle r)
-			{
-				return new RECT(r);
-			}
-
-			public static bool operator ==(RECT r1, RECT r2)
-			{
-				return r1.Equals(r2);
-			}
-
-			public static bool operator !=(RECT r1, RECT r2)
-			{
-				return !r1.Equals(r2);
-			}
-
-			public bool Equals(RECT r)
-			{
-				return r.Left == Left && r.Top == Top && r.Right == Right && r.Bottom == Bottom;
-			}
-
-			public override bool Equals(object obj)
-			{
-				if (obj is RECT rect)
-				{
-					return Equals(rect);
-				}
-
-				if (obj is Rectangle rectangle)
-				{
-					return Equals(new RECT(rectangle));
-				}
-
-				return false;
-			}
-
-			public override int GetHashCode()
-			{
-				return ((Rectangle)this).GetHashCode();
-			}
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct SIZE
-		{
-			public int Width;
-			public int Height;
-
-			public SIZE(int width, int height)
-			{
-				Width = width;
-				Height = height;
-			}
-
-			public static explicit operator Size(SIZE s)
-			{
-				return new Size(s.Width, s.Height);
-			}
-
-			public static explicit operator SIZE(Size s)
-			{
-				return new SIZE(s.Width, s.Height);
-			}
-
-			public override string ToString()
-			{
-				return string.Format("{0}x{1}", Width, Height);
-			}
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct POINT
-		{
-			public int X;
-			public int Y;
-
-			public POINT(int x, int y)
-			{
-				X = x;
-				Y = y;
-			}
-
-			public static explicit operator Point(POINT p)
-			{
-				return new Point(p.X, p.Y);
-			}
-
-			public static explicit operator POINT(Point p)
-			{
-				return new POINT(p.X, p.Y);
-			}
-		}
-
-		public enum DwmWindowAttribute : uint
-		{
-			/// <summary>
-			/// Use with DwmGetWindowAttribute. Discovers whether non-client rendering is enabled. The retrieved value is of type BOOL. TRUE if non-client rendering is enabled; otherwise, FALSE.
-			/// </summary>
-			DWMWA_NCRENDERING_ENABLED = 1,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Sets the non-client rendering policy. The pvAttribute parameter points to a value from the DWMNCRENDERINGPOLICY enumeration.
-			/// </summary>
-			DWMWA_NCRENDERING_POLICY,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Enables or forcibly disables DWM transitions. The pvAttribute parameter points to a value of TRUE to disable transitions or FALSE to enable transitions.
-			/// </summary>
-			DWMWA_TRANSITIONS_FORCEDISABLED,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Enables content rendered in the non-client area to be visible on the frame drawn by DWM. The pvAttribute parameter points to a value of TRUE to enable content rendered in the non-client area to be visible on the frame; otherwise, it points to FALSE.
-			/// </summary>
-			DWMWA_ALLOW_NCPAINT,
-			/// <summary>
-			/// Use with DwmGetWindowAttribute. Retrieves the bounds of the caption button area in the window-relative space. The retrieved value is of type RECT.
-			/// </summary>
-			DWMWA_CAPTION_BUTTON_BOUNDS,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Specifies whether non-client content is right-to-left (RTL) mirrored. The pvAttribute parameter points to a value of TRUE if the non-client content is right-to-left (RTL) mirrored; otherwise, it points to FALSE.
-			/// </summary>
-			DWMWA_NONCLIENT_RTL_LAYOUT,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Forces the window to display an iconic thumbnail or peek representation (a static bitmap), even if a live or snapshot representation of the window is available. This value normally is set during a window's creation and not changed throughout the window's lifetime. Some scenarios, however, might require the value to change over time. The pvAttribute parameter points to a value of TRUE to require a iconic thumbnail or peek representation; otherwise, it points to FALSE.
-			/// </summary>
-			DWMWA_FORCE_ICONIC_REPRESENTATION,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Sets how Flip3D treats the window. The pvAttribute parameter points to a value from the DWMFLIP3DWINDOWPOLICY enumeration.
-			/// </summary>
-			DWMWA_FLIP3D_POLICY,
-			/// <summary>
-			/// Use with DwmGetWindowAttribute. Retrieves the extended frame bounds rectangle in screen space. The retrieved value is of type RECT.
-			/// </summary>
-			DWMWA_EXTENDED_FRAME_BOUNDS,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. The window will provide a bitmap for use by DWM as an iconic thumbnail or peek representation (a static bitmap) for the window. DWMWA_HAS_ICONIC_BITMAP can be specified with DWMWA_FORCE_ICONIC_REPRESENTATION. DWMWA_HAS_ICONIC_BITMAP normally is set during a window's creation and not changed throughout the window's lifetime. Some scenarios, however, might require the value to change over time. The pvAttribute parameter points to a value of TRUE to inform DWM that the window will provide an iconic thumbnail or peek representation; otherwise, it points to FALSE.
-			/// </summary>
-			DWMWA_HAS_ICONIC_BITMAP,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Do not show peek preview for the window. The peek view shows a full-sized preview of the window when the mouse hovers over the window's thumbnail in the taskbar. If this attribute is set, hovering the mouse pointer over the window's thumbnail dismisses peek (in case another window in the group has a peek preview showing). The pvAttribute parameter points to a value of TRUE to prevent peek functionality or FALSE to allow it.
-			/// </summary>
-			DWMWA_DISALLOW_PEEK,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Prevents a window from fading to a glass sheet when peek is invoked. The pvAttribute parameter points to a value of TRUE to prevent the window from fading during another window's peek or FALSE for normal behavior.
-			/// </summary>
-			DWMWA_EXCLUDED_FROM_PEEK,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Cloaks the window such that it is not visible to the user. The window is still composed by DWM.
-			/// </summary>
-			DWMWA_CLOAK,
-			/// <summary>
-			/// Use with DwmGetWindowAttribute.
-			/// </summary>
-			DWMWA_CLOAKED,
-			/// <summary>
-			/// Use with DwmSetWindowAttribute. Freeze the window's thumbnail image with its current visuals. Do no further live updates on the thumbnail image to match the window's contents.
-			/// </summary>
-			DWMWA_FREEZE_REPRESENTATION,
-			/// <summary>
-			/// The maximum recognized DWMWINDOWATTRIBUTE value, used for validation purposes.
-			/// </summary>
-			DWMWA_LAST,
-			// Undocumented, available since October 2018 update (build 17763)
-			DWMWA_USE_IMMERSIVE_DARK_MODE_BEFORE_20H1 = 19,
-			// Windows 10 20H1 changed the value of the constant
-			DWMWA_USE_IMMERSIVE_DARK_MODE = 20
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		private struct WINDOWINFO
-		{
-			public uint cbSize;
-			public RECT rcWindow;
-			public RECT rcClient;
-			public uint dwStyle;
-			public uint dwExStyle;
-			public uint dwWindowStatus;
-			public uint cxWindowBorders;
-			public uint cyWindowBorders;
-			public ushort atomWindowType;
-			public ushort wCreatorVersion;
-
-			public static WINDOWINFO Create()
-			{
-				WINDOWINFO wi = new WINDOWINFO();
-				wi.cbSize = (uint)Marshal.SizeOf(typeof(WINDOWINFO));
-				return wi;
-			}
-		}
-	}
-}
diff --git a/StageManager/Strategies/IWindowStrategy.cs b/StageManager/Strategies/IWindowStrategy.cs
index 64d1044..55cee7b 100644
--- a/StageManager/Strategies/IWindowStrategy.cs
+++ b/StageManager/Strategies/IWindowStrategy.cs
@@ -4,6 +4,8 @@ namespace StageManager.Strategies
 {
     internal interface IWindowStrategy
 	{
-		void Invoke(IWindow window);
+		void Show(IWindow window);
+
+		void Hide(IWindow window);
 	}
 }
\ No newline at end of file
diff --git a/StageManager/Strategies/NormalizeAndMinimizeWindowStrategy.cs b/StageManager/Strategies/NormalizeAndMinimizeWindowStrategy.cs
new file mode 100644
index 0000000..9ae1cfc
--- /dev/null
+++ b/StageManager/Strategies/NormalizeAndMinimizeWindowStrategy.cs
@@ -0,0 +1,18 @@
+using StageManager.Native.PInvoke;
+using StageManager.Native.Window;
+
+namespace StageManager.Strategies
+{
+    internal class NormalizeAndMinimizeWindowStrategy : IWindowStrategy
+	{
+		public void Show(IWindow window)
+		{
+			Win32.ShowWindow(window.Handle, Win32.SW.SW_SHOWNOACTIVATE);
+		}
+
+		public void Hide(IWindow window)
+		{
+			Win32.ShowWindow(window.Handle, Win32.SW.SW_MINIMIZE);
+		}
+	}
+}
diff --git a/StageManager/Strategies/OpacityWindowStrategy.cs b/StageManager/Strategies/OpacityWindowStrategy.cs
new file mode 100644
index 0000000..237a335
--- /dev/null
+++ b/StageManager/Strategies/OpacityWindowStrategy.cs
@@ -0,0 +1,40 @@
+using StageManager.Native.Window;
+using System;
+using System.Runtime.InteropServices;
+
+namespace StageManager.Strategies
+{
+	/// <summary>
+	/// Works well with opacity = 0, higher opacity will make the windows appear when clicked
+	/// Visual Studio cannot be hidden this way, might be the same with other windows
+	/// </summary>
+	internal class OpacityWindowStrategy : IWindowStrategy
+	{
+		[DllImport("user32.dll")]
+		static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+		[DllImport("user32.dll")]
+		static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+		[DllImport("user32.dll")]
+		public static extern bool SetLayeredWindowAttributes(IntPtr hwnd, uint crKey, byte bAlpha, uint dwFlags);
+
+		public const int GWL_EXSTYLE = -20;
+		public const int WS_EX_LAYERED = 0x80000;
+		public const int LWA_ALPHA = 0x2;
+
+		public void Show(IWindow window)
+		{
+			_ = SetWindowLong(window.Handle, GWL_EXSTYLE, GetWindowLong(window.Handle, GWL_EXSTYLE) | WS_EX_LAYERED);
+			SetLayeredWindowAttributes(window.Handle, 0, 255, LWA_ALPHA);
+
+			window.BringToTop();
+		}
+
+		public void Hide(IWindow window)
+		{
+			_ = SetWindowLong(window.Handle, GWL_EXSTYLE, GetWindowLong(window.Handle, GWL_EXSTYLE) | WS_EX_LAYERED);
+			SetLayeredWindowAttributes(window.Handle, 0, 0, LWA_ALPHA);
+		}
+	}
+}
\ No newline at end of file
diff --git a/StageManager/Strategies/ScreenOffsetWindowStrategy.cs b/StageManager/Strategies/ScreenOffsetWindowStrategy.cs
new file mode 100644
index 0000000..727643c
--- /dev/null
+++ b/StageManager/Strategies/ScreenOffsetWindowStrategy.cs
@@ -0,0 +1,17 @@
+using StageManager.Native.Window;
+
+namespace StageManager.Strategies
+{
+	internal class ScreenOffsetWindowStrategy : IWindowStrategy
+	{
+		public void Show(IWindow window)
+		{
+			throw new System.NotImplementedException();
+		}
+
+		public void Hide(IWindow window)
+		{
+			throw new System.NotImplementedException();
+		}
+	}
+}
diff --git a/StageManager/Strategies/ShowAndHideWindowStrategy.cs b/StageManager/Strategies/ShowAndHideWindowStrategy.cs
new file mode 100644
index 0000000..8e385b2
--- /dev/null
+++ b/StageManager/Strategies/ShowAndHideWindowStrategy.cs
@@ -0,0 +1,21 @@
+using StageManager.Native.Window;
+
+namespace StageManager.Strategies
+{
+	/// <summary>
+	/// Shows and hides windows, which makes them disappear completely until they are showed again.
+	/// The user cannot bring them back without some advanced tricks.
+	/// </summary>
+	internal class ShowAndHideWindowStrategy : IWindowStrategy
+	{
+		public void Show(IWindow window)
+		{
+			window.ShowInCurrentState();
+		}
+
+		public void Hide(IWindow window)
+		{
+			window.Hide();
+		}
+	}
+}
diff --git a/StageManager/Strategies/WindowHideStrategy.cs b/StageManager/Strategies/WindowHideStrategy.cs
deleted file mode 100644
index 82c4505..0000000
--- a/StageManager/Strategies/WindowHideStrategy.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using StageManager.Native.Window;
-
-namespace StageManager.Strategies
-{
-    internal class WindowHideStratgy : IWindowStrategy
-	{
-		public void Invoke(IWindow window)
-		{
-			window.Hide();
-		}
-
-		public bool IsRelevant(IWindow window)
-		{
-			return window.CanLayout;
-		}
-	}
-}
diff --git a/StageManager/Strategies/WindowMinimizeStrategy .cs b/StageManager/Strategies/WindowMinimizeStrategy .cs
deleted file mode 100644
index dd7ca51..0000000
--- a/StageManager/Strategies/WindowMinimizeStrategy .cs	
+++ /dev/null
@@ -1,13 +0,0 @@
-using StageManager.Native.PInvoke;
-using StageManager.Native.Window;
-
-namespace StageManager.Strategies
-{
-    internal class WindowMinimizeStrategy : IWindowStrategy
-	{
-		public void Invoke(IWindow window)
-		{
-			Win32.ShowWindow(window.Handle, Win32.SW.SW_MINIMIZE);
-		}
-	}
-}
diff --git a/StageManager/Strategies/WindowNormalizeStrategy.cs b/StageManager/Strategies/WindowNormalizeStrategy.cs
deleted file mode 100644
index e847ac9..0000000
--- a/StageManager/Strategies/WindowNormalizeStrategy.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using StageManager.Native.PInvoke;
-using StageManager.Native.Window;
-
-namespace StageManager.Strategies
-{
-    internal class WindowNormalizeStrategy : IWindowStrategy
-	{
-		public void Invoke(IWindow window)
-		{
-			Win32.ShowWindow(window.Handle, Win32.SW.SW_SHOWNOACTIVATE);
-		}
-	}
-}
diff --git a/StageManager/Strategies/WindowShowStrategy.cs b/StageManager/Strategies/WindowShowStrategy.cs
deleted file mode 100644
index 829417d..0000000
--- a/StageManager/Strategies/WindowShowStrategy.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using StageManager.Native.Window;
-
-namespace StageManager.Strategies
-{
-    internal class WindowShowStrategy : IWindowStrategy
-	{
-		public void Invoke(IWindow window)
-		{
-			window.ShowInCurrentState();
-		}
-	}
-}