diff --git a/Source/Builder.csproj b/Source/Builder.csproj
index b2a8d472..650bfd5f 100644
--- a/Source/Builder.csproj
+++ b/Source/Builder.csproj
@@ -665,6 +665,9 @@
     <Compile Include="Config\FlagTranslation.cs" />
     <Compile Include="Data\PK3FileImage.cs" />
     <Compile Include="Data\PK3StructuredReader.cs" />
+    <Compile Include="Decorate\ActorStructure.cs" />
+    <Compile Include="Decorate\DecorateParser.cs" />
+    <Compile Include="Decorate\StatesStructure.cs" />
     <Compile Include="Editing\EditingManager.cs" />
     <EmbeddedResource Include="Resources\Crosshair.png" />
     <EmbeddedResource Include="Resources\CrosshairBusy.png" />
diff --git a/Source/Controls/ImageBrowserControl.cs b/Source/Controls/ImageBrowserControl.cs
index 9bc79478..3e1e7ef9 100644
--- a/Source/Controls/ImageBrowserControl.cs
+++ b/Source/Controls/ImageBrowserControl.cs
@@ -83,7 +83,8 @@ namespace CodeImp.DoomBuilder.Controls
 			// Initialize
 			InitializeComponent();
 			items = new List<ImageBrowserItem>();
-
+			list.TileSize = new Size(PreviewManager.IMAGE_WIDTH + 26, PreviewManager.IMAGE_HEIGHT + 26);
+			
 			// Move textbox with label
 			objectname.Left = label.Right + label.Margin.Right + objectname.Margin.Left;
 		}
diff --git a/Source/Controls/ImageBrowserItem.cs b/Source/Controls/ImageBrowserItem.cs
index 4000e41e..b2582d27 100644
--- a/Source/Controls/ImageBrowserItem.cs
+++ b/Source/Controls/ImageBrowserItem.cs
@@ -97,8 +97,8 @@ namespace CodeImp.DoomBuilder.Controls
 
 			// Determine coordinates
 			SizeF textsize = g.MeasureString(this.Text, this.ListView.Font, bounds.Width);
-			Rectangle imagerect = new Rectangle(bounds.Left + ((bounds.Width - 64) >> 1),
-				bounds.Top + ((bounds.Height - 64 - (int)textsize.Height) >> 1), 64, 64);
+			Rectangle imagerect = new Rectangle(bounds.Left + ((bounds.Width - PreviewManager.IMAGE_WIDTH) >> 1),
+				bounds.Top + ((bounds.Height - PreviewManager.IMAGE_HEIGHT - (int)textsize.Height) >> 1), PreviewManager.IMAGE_WIDTH, PreviewManager.IMAGE_HEIGHT);
 			PointF textpos = new PointF(bounds.Left + ((float)bounds.Width - textsize.Width) * 0.5f, bounds.Bottom - textsize.Height - 2);
 
 			// Determine colors
diff --git a/Source/Decorate/ActorStructure.cs b/Source/Decorate/ActorStructure.cs
new file mode 100644
index 00000000..bd8fba2c
--- /dev/null
+++ b/Source/Decorate/ActorStructure.cs
@@ -0,0 +1,61 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Data;
+using System.IO;
+using System.Diagnostics;
+using CodeImp.DoomBuilder.Compilers;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Decorate
+{
+	public sealed class ActorStructure
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal ActorStructure(Stream stream)
+		{
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}
diff --git a/Source/Decorate/DecorateParser.cs b/Source/Decorate/DecorateParser.cs
new file mode 100644
index 00000000..3fa3c682
--- /dev/null
+++ b/Source/Decorate/DecorateParser.cs
@@ -0,0 +1,63 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Data;
+using System.IO;
+using System.Diagnostics;
+using CodeImp.DoomBuilder.Compilers;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Decorate
+{
+	public sealed class DecorateParser
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private List<ActorStructure> actors;
+
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal DecorateParser(Stream stream)
+		{
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}
diff --git a/Source/Decorate/StatesStructure.cs b/Source/Decorate/StatesStructure.cs
new file mode 100644
index 00000000..d94c4fec
--- /dev/null
+++ b/Source/Decorate/StatesStructure.cs
@@ -0,0 +1,63 @@
+
+#region ================== Copyright (c) 2007 Pascal vd Heiden
+
+/*
+ * Copyright (c) 2007 Pascal vd Heiden, www.codeimp.com
+ * This program is released under GNU General Public License
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ */
+
+#endregion
+
+#region ================== Namespaces
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text;
+using CodeImp.DoomBuilder.IO;
+using CodeImp.DoomBuilder.Data;
+using System.IO;
+using System.Diagnostics;
+using CodeImp.DoomBuilder.Compilers;
+
+#endregion
+
+namespace CodeImp.DoomBuilder.Decorate
+{
+	public sealed class StatesStructure
+	{
+		#region ================== Constants
+
+		#endregion
+
+		#region ================== Variables
+
+		private List<StatesStructure> states;
+		
+		#endregion
+
+		#region ================== Properties
+
+		#endregion
+
+		#region ================== Constructor / Disposer
+
+		// Constructor
+		internal StatesStructure(Stream stream)
+		{
+		}
+
+		#endregion
+
+		#region ================== Methods
+
+		#endregion
+	}
+}